summaryrefslogtreecommitdiffstats
path: root/src/qt3support
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-10 11:18:09 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-10 11:18:09 (GMT)
commit504fb8a30ffef1f90a4cd4d61ab7f73c95fd9a03 (patch)
treeac7456cb14db561af960a579a1608d043c905c54 /src/qt3support
parent12d63b05a942281e688d857d17c190564c77b698 (diff)
parent66e22b5b65b09cf4824dbfbc91e8dea04e8e4214 (diff)
downloadQt-504fb8a30ffef1f90a4cd4d61ab7f73c95fd9a03.zip
Qt-504fb8a30ffef1f90a4cd4d61ab7f73c95fd9a03.tar.gz
Qt-504fb8a30ffef1f90a4cd4d61ab7f73c95fd9a03.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: MAke the SIMD fiunctions be used even when the QT_NO_DEBUG macro is used Make sure 16-bit EGL configs are chosen over 32-bit configs Make the EGL contexts in QX11GLPixmapData Q_GLOBAL_STATIC Handle EGLSurfaces better, including more error detection Make sure pixmap hooks get installed so EGL surfaces are cleaned up Don't show resize cursor for fixed-size windows
Diffstat (limited to 'src/qt3support')
0 files changed, 0 insertions, 0 deletions