summaryrefslogtreecommitdiffstats
path: root/src/gui/egl/qegl.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-23 11:54:56 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-23 11:54:56 (GMT)
commit31ce7ae7c7dcf2349b3af5f9b5ec8cd746d62dd7 (patch)
tree15bf6de7cdb59124b1b89b583108bdebaebf89e3 /src/gui/egl/qegl.cpp
parentaeeb83806daaa2ddb4b6c87162c929d61cf1350c (diff)
parentb5b096996de656dc44723b02826d892291173797 (diff)
downloadQt-31ce7ae7c7dcf2349b3af5f9b5ec8cd746d62dd7.zip
Qt-31ce7ae7c7dcf2349b3af5f9b5ec8cd746d62dd7.tar.gz
Qt-31ce7ae7c7dcf2349b3af5f9b5ec8cd746d62dd7.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed two problems with generated EPS files. tst_qlineedit: add contains(QT_CONFIG,qt3support) to the .pro file to make it compile Fix regression: auto completion text cursor problem in Q3FileDialog
Diffstat (limited to 'src/gui/egl/qegl.cpp')
0 files changed, 0 insertions, 0 deletions