summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglwindowsurface_qws.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-21 23:52:06 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-21 23:52:06 (GMT)
commitc70e3f24a97b82f5ce9ad890fa95369e425a31ac (patch)
tree432987220d2f7fa2b96a5307d0d8608e7eb184be /src/opengl/qglwindowsurface_qws.cpp
parent07f131927faa09402589da7b4bfb516482f59e46 (diff)
parentc05f38f37fbe2192d135881de3dba087ac71ffe1 (diff)
downloadQt-c70e3f24a97b82f5ce9ad890fa95369e425a31ac.zip
Qt-c70e3f24a97b82f5ce9ad890fa95369e425a31ac.tar.gz
Qt-c70e3f24a97b82f5ce9ad890fa95369e425a31ac.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert "Compile fix for MSVC" Compile fix for MSVC Improve QAccessible for QAccessibleTabBar Improve QAccessible for QTabBar fix the export macros for the QtDBus module rebuild configure.exe make "configure -qt-gif" work again on Windows Fix a typo in harfbuzz thai line breaking. Ensure that font sizes that are > 0 and < 1 are still respected
Diffstat (limited to 'src/opengl/qglwindowsurface_qws.cpp')
0 files changed, 0 insertions, 0 deletions