summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/snippets.pro
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-16 10:11:46 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-16 10:11:46 (GMT)
commitb6e8943592ec6b2cbc619c35ca90feded0e1e87b (patch)
treebb971d036401ac7eeb1cda928ae764408b48f141 /doc/src/snippets/snippets.pro
parent554eedb76ecceca5123992147ed1aa48aabc6662 (diff)
parent82575a9f6123eed3e8581b6e73833924fe47cace (diff)
downloadQt-b6e8943592ec6b2cbc619c35ca90feded0e1e87b.zip
Qt-b6e8943592ec6b2cbc619c35ca90feded0e1e87b.tar.gz
Qt-b6e8943592ec6b2cbc619c35ca90feded0e1e87b.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: Fixed regression in QPixmap::size() for null pixmaps. Make test less sensitive to platform specifics Doc: Further QML improvements. Doc: Minor improvements to QML-related documentation. The test livelock of QTimer is now expected to work Make sure mapSelectionFromSource does not return a selection with invalid ranges. QEventDispatcherUnix: do not process too many timer if other events need to be processed first Doc: Continued work on the QML documentation. Doc: More work on the QML documentation. Doc: More work on the declarative API documentation. Doc: Some editing and tidying up. Doc: Added a missing file. Doc: Fixed text in license headers.
Diffstat (limited to 'doc/src/snippets/snippets.pro')
0 files changed, 0 insertions, 0 deletions