summaryrefslogtreecommitdiffstats
path: root/src/corelib/concurrent/qtconcurrentmap.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-05-20 12:19:20 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-05-20 12:19:20 (GMT)
commit534f5098c577f262b4b01d1c21cd0ec1af0f25f1 (patch)
tree4dd5ef7c208534607895012ff99af03b2c553f0f /src/corelib/concurrent/qtconcurrentmap.h
parent800c9df03328db934ccadb94fe75c684ed282aa1 (diff)
parent11084503c711f862baa4d4027a7b97cedae1034e (diff)
downloadQt-534f5098c577f262b4b01d1c21cd0ec1af0f25f1.zip
Qt-534f5098c577f262b4b01d1c21cd0ec1af0f25f1.tar.gz
Qt-534f5098c577f262b4b01d1c21cd0ec1af0f25f1.tar.bz2
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fixed compilation. Re-apply licenseheader text in source files for qt4.7 Updating file with CRLF line endings for the updated header Fix a regression in QList::mid() Fixed bug in meego graphics system runtime switching. Fix memory leak in QXmlQuery::setQuery. update gitignore remove -fno-stack-protector Fix make confclean Update licenseheader text in source files doc: Fixed QTBUG-19226 doc: Fixed QTBUG-19223 doc: Remved debug code for QTBUG-18791 doc: Fixed QTBUG-18791 doc: Fixed a QML snippet reference
Diffstat (limited to 'src/corelib/concurrent/qtconcurrentmap.h')
0 files changed, 0 insertions, 0 deletions