summaryrefslogtreecommitdiffstats
path: root/tests/auto/qgraphicsview
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-07 21:40:10 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-07 21:40:10 (GMT)
commit558acd8c8ff94c6fd1e96514a2dffb587a66bb2f (patch)
treedc11d87ae4982458b78d10337afbc03fcb88382d /tests/auto/qgraphicsview
parent161f15e1e79ec5f23244da68340ba1e78f3ac4bb (diff)
parentdf61814c228e6f2badf378e25b69daf9941c646b (diff)
downloadQt-558acd8c8ff94c6fd1e96514a2dffb587a66bb2f.zip
Qt-558acd8c8ff94c6fd1e96514a2dffb587a66bb2f.tar.gz
Qt-558acd8c8ff94c6fd1e96514a2dffb587a66bb2f.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: (26 commits) Live texture updates to meegographicssystem helper. Live texture updates to meegographicssystem plugin. Revert the integration of the merge request 2286. Fix text rendering in GL when using the broken-fbo-fallback ActiveQt: also make the designer plugin for qaxwidget build in the opensource versions Fix compilation Code cleaning with the merge request 2286 Fix a pending issue with the merge request 2286 Doc: fix description of the expected behavior for QGraphicsItem::cursor Fixed the build error in qtconfig Resolved a little code style issue in qtconfig Renamed controls in qtconfig's MainWindow Removed inheritance from UI file in qtconfig's MainWindow Fixed a bug and resolved some translation issues in qtconfig Fixed some problems in qtconfig's PreviewWidget Removed the inheritance from ui file in qtconfig's PaletteEditorAdvanced Replaced the unnecessary include with declaration Resolved some code style issues and fixed the broken copyright year Finally removed the qtconfig dependency from qt3support Modified previewwidget's ui file in qtconfig ...
Diffstat (limited to 'tests/auto/qgraphicsview')
0 files changed, 0 insertions, 0 deletions