summaryrefslogtreecommitdiffstats
path: root/tests/auto/qfuture
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-13 20:14:59 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-13 20:14:59 (GMT)
commit444fa479484f80cbd5de3e9c5fa2b2e4082643dd (patch)
treeb347bf94244c52cab12515d6edacd01c7fe13478 /tests/auto/qfuture
parentdf28c1203e12c572f795b8d114254a8e5a6619e8 (diff)
parent1404c38ad9d1bf5412ca49da7b2b50295d0ce0fb (diff)
downloadQt-444fa479484f80cbd5de3e9c5fa2b2e4082643dd.zip
Qt-444fa479484f80cbd5de3e9c5fa2b2e4082643dd.tar.gz
Qt-444fa479484f80cbd5de3e9c5fa2b2e4082643dd.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: (75 commits) fix macx not having UNICODE in DEFINES any more doc: Fixed several qdoc warnings. Fix an Assert in QTextTable doc: Fixed several qdoc warnings. QSslSocket: Improve error handling qdoc: Fixed several <div> elements that had the "/>" ending. QSslSocket: fix documentation for QSslSocket::setPeerVerifyMode() qdoc: Fixed breadcrumbs for QML examples. remove redundand translations project files make projects lupdate-friendly Timing fix for slow devices. QNAM: Add future enum attribute for Zerocopy QNAM fixed built-in jpeg and tiff in configure.exe, QTBUG-12093 fix indentation fix build for -no-qt3support Compile fix for bearermonitor example Doc: Cleaning style and adding support for Creator Add NTLMv2 authentication support to QAuthenticator. QIODPLB: Sync behavior of ungetBlock() and ungetChar() QFileIconProvider: Load icons on demand. ...
Diffstat (limited to 'tests/auto/qfuture')
0 files changed, 0 insertions, 0 deletions