summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgraphicssystem_gl.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-16 06:32:11 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-16 06:32:11 (GMT)
commitaa10d0538307e6a6035018a1e6c82d9851d017a1 (patch)
tree65b658582151aa9b47a6b9843463dddd032a8323 /src/opengl/qgraphicssystem_gl.cpp
parentab90235dfa1874e5c70875ed9b68817e698a55b3 (diff)
parent1c0ed07f8f65a2b8d5a189ac3e438bd798a87ed1 (diff)
downloadQt-aa10d0538307e6a6035018a1e6c82d9851d017a1.zip
Qt-aa10d0538307e6a6035018a1e6c82d9851d017a1.tar.gz
Qt-aa10d0538307e6a6035018a1e6c82d9851d017a1.tar.bz2
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Join user state of removed text blocks Adding Persian translation of Qt. Missed break of switch-case added Fix softkeys cleanup Fix clientRect usage in QWidgetPrivate::setGeometry_sys() Do not allow fullscreen/maximized windows to expand beyond client rect Do not modify window size for fullscreen windows in setGeometry_sys
Diffstat (limited to 'src/opengl/qgraphicssystem_gl.cpp')
0 files changed, 0 insertions, 0 deletions