summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-12 13:55:57 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-12 13:55:57 (GMT)
commit41cbfc5c8e6644ab21e92860db95b2e8da9aba6a (patch)
tree3629877036a08414a969d6f2693d7f5970dd62c3 /src/corelib/global
parent47760d59d57f548d5816ae43e456c86e01146491 (diff)
parentbd11cdf472674af3b00d7d64c64023adbf5ee725 (diff)
downloadQt-41cbfc5c8e6644ab21e92860db95b2e8da9aba6a.zip
Qt-41cbfc5c8e6644ab21e92860db95b2e8da9aba6a.tar.gz
Qt-41cbfc5c8e6644ab21e92860db95b2e8da9aba6a.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: (158 commits) qdoc: Yet another revision of the top doc page. Doc: Update on web template Added QDateTime::msecsTo() Doc: Fixed tables and images for the new docs qdoc: Yet another revision of the top doc page. Revert "Improve QUrl handling of local file paths" Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively" Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to" Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs." qdoc: Another revision of the top doc page. Doc correction to css Doc: Updates to the html template and javascript tst_SuiteTest: Fix a meaningless switch statement My 4.7.0 changelog entries. qdoc: Fixed annotated list generation to use <td>, not <th>. Doc: Tuning search script qdoc: Reorganized examples panel. Doc: Chages to search feature, css and table order QtDeclarative: avoid waiting for a network load on URIs with empty schemes. QtDeclarative: RFC 3986 requires schemes to be considered case-insensitively ...
Diffstat (limited to 'src/corelib/global')
0 files changed, 0 insertions, 0 deletions