Conflicts: .qmake.conf config.tests/unix/nis/nis.cpp mkspecs/unsupported/freebsd-g++/qplatformdefs.h src/corelib/tools/qdatetime.cpp src/corelib/tools/qsimd.cpp src/corelib/tools/qsimd_p.h src/network/access/access.pri src/network/access/qnetworkreplynsurlconnectionimpl.mm src/network/access/qnetworkreplynsurlconnectionimpl_p.h src/plugins/platforms/cocoa/qnsview.mm src/plugins/printsupport/windows/qwindowsprintdevice.cpp tests/auto/corelib/kernel/qobject/tst_qobject.cpp tests/auto/network/access/qnetworkreply/BLACKLIST tests/auto/widgets/widgets/qopenglwidget/BLACKLIST Change-Id: I4b32055bbf922392ef0264fd403405416fffee57 |
||
|---|---|---|
| .. | ||
| framebufferobject2 | ||
| grabber | ||
| hellogl | ||
| overpainting | ||
| pbuffers | ||
| pbuffers2 | ||
| samplebuffers | ||
| shared | ||
| README | ||
| legacy.pro | ||
README
This directory contains legacy examples that use the fixed pipeline and thus are not compatible with OpenGL ES 2.0+ and the core profile of OpenGL 3.0+. They also rely on the Qt OpenGL module (e.g. QGLWidget) which is not advisable in new application.