summaryrefslogtreecommitdiffstats
path: root/doc/src/examples/states.qdoc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-11-24 09:19:07 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-11-24 09:19:07 (GMT)
commit0e7c7f75b404c26b420cb174f062eda02846641f (patch)
tree111d1e8480d96de6554e58c7c2a3a0695ddbcc73 /doc/src/examples/states.qdoc
parent67b3edc50ad6e574f777d9accebe0750fbe3ddf7 (diff)
parenta4ce1a327ae3658394a2acd8a3769f3bbba50863 (diff)
downloadQt-0e7c7f75b404c26b420cb174f062eda02846641f.zip
Qt-0e7c7f75b404c26b420cb174f062eda02846641f.tar.gz
Qt-0e7c7f75b404c26b420cb174f062eda02846641f.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix Linux-Symbian parallel cross-compilation configure step Symbian: don't merge native clipboard, overwrite. Surviving out of memory in Qt Quick app Export QtGui functions required by QtMultimediaKit backend fix bearer crash Fix alignment of non-wrapped richtext QML Text elements.
Diffstat (limited to 'doc/src/examples/states.qdoc')
0 files changed, 0 insertions, 0 deletions