summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-14 09:49:01 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-14 09:49:01 (GMT)
commit5de30ecf4c28279fe8eed0ed8cb53504eb1350d7 (patch)
tree49af06e86b70d06ea090077f68931877c36e0ff9 /demos
parent5b6933ae8e2bb8b3ca33ef7f31ba564b4cb53bec (diff)
parentf2e723839b4067581fc2974a29aebdd41cb881f6 (diff)
downloadQt-5de30ecf4c28279fe8eed0ed8cb53504eb1350d7.zip
Qt-5de30ecf4c28279fe8eed0ed8cb53504eb1350d7.tar.gz
Qt-5de30ecf4c28279fe8eed0ed8cb53504eb1350d7.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fix static text item positioning GL2 paint engine Fix combining marks handling in Core Text shaper Fix PBuffer example to work again
Diffstat (limited to 'demos')
0 files changed, 0 insertions, 0 deletions