summaryrefslogtreecommitdiffstats
path: root/src/script/bridge/qscriptglobalobject.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-17 00:39:13 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-17 00:39:13 (GMT)
commit53fd1e2fd9c75d7d55606d4ac5df75eda96b9cc9 (patch)
tree246c5d0e80a1bf9187e462c767e36fd8d152bb78 /src/script/bridge/qscriptglobalobject.cpp
parentb83172f8cfb4439f17c96886f0c6046a885370f6 (diff)
parent111708e655d66fb0dcbc4f2cbdc2abf14c700cf4 (diff)
downloadQt-53fd1e2fd9c75d7d55606d4ac5df75eda96b9cc9.zip
Qt-53fd1e2fd9c75d7d55606d4ac5df75eda96b9cc9.tar.gz
Qt-53fd1e2fd9c75d7d55606d4ac5df75eda96b9cc9.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: Fix the QPrintDialog showing a popup with nothing. Fix OpenGL2 paint engine compilation issue Speed up various QFontMetrics functions Avoid using uncompatible vertex shader for non-solid brushes
Diffstat (limited to 'src/script/bridge/qscriptglobalobject.cpp')
0 files changed, 0 insertions, 0 deletions