summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl_egl_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-07 07:01:56 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-07 07:01:56 (GMT)
commitd5fc77cb77b499d4158e2e149417b34833602523 (patch)
treecb9baba41d721177f9ec4afd1391cc63bc5fb98a /src/opengl/qgl_egl_p.h
parentae1e2319bccfc57cc47614ece39e64b80e5f2380 (diff)
parent9888fa259875d82bf08a28cac134fe6f71f371f0 (diff)
downloadQt-d5fc77cb77b499d4158e2e149417b34833602523.zip
Qt-d5fc77cb77b499d4158e2e149417b34833602523.tar.gz
Qt-d5fc77cb77b499d4158e2e149417b34833602523.tar.bz2
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (100 commits) Fix proxy reading from gconf so that it is only done once / session. rebuild configure fix misleading uppercasing deprecation warning Enable Phonon on Symbian by default. Disable OpenGL on Symbian only by default instead of always VFP type on ARM option in Linux configure script Adding -dont-process option to Unix configure script Synchronized configure.exe OpenGL options with Unix configure build lrelease as part of the "libs" part. purge vestiges of imageformat-plugins Unify epocroot usage in createpackage and patch_capabilities scripts Update visual tests for the recent qmlviewer change Do not use openGL on Mac OS X for QML visual tests Give qmlviewer a minimum size if root object has no size. Add 'Writing New Components' docs, and document the connect() function. Mention that image providers should be added before loading QML files Update QML visual tests Cleaned up sis_targets.prf Append qml import path individually for each available drive on Symbian Update TextInput when echoMode changes. ...
Diffstat (limited to 'src/opengl/qgl_egl_p.h')
0 files changed, 0 insertions, 0 deletions