summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-26 23:39:07 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-26 23:39:07 (GMT)
commit09293f1d07b019dc7bfe95afb93364cc87774e82 (patch)
tree0bb2e3da34f6ad6898fc079e39e1e94a94da12e2 /doc/src/declarative
parent0274069a9f6f011a97baf283d556b1fec388b672 (diff)
parent22c57db236d7cd72ea6c06dfd22c174d81cd8504 (diff)
downloadQt-09293f1d07b019dc7bfe95afb93364cc87774e82.zip
Qt-09293f1d07b019dc7bfe95afb93364cc87774e82.tar.gz
Qt-09293f1d07b019dc7bfe95afb93364cc87774e82.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: add translator comment save a QFile::encodeName() Don't use QList's begin() and end() where possible. Ensure we stop the name lookups in QAbstractSocket if we abort(). Don't rely on tryStart() to do job control. Improved workaround for new qt documentation, base on dboddie's work. Doc: Fixed typos. Ensure that all qthelp URLs have paths that start with /qdoc/. Doc: Fixed the Declarative documentation set. Tweaked the others.
Diffstat (limited to 'doc/src/declarative')
0 files changed, 0 insertions, 0 deletions