summaryrefslogtreecommitdiffstats
path: root/src/corelib/concurrent/qtconcurrentexception.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-06 03:40:25 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-06 03:40:25 (GMT)
commit63711cb855114b879c6bad192708bf6a19c31f32 (patch)
tree02a0cba8fdceb031afa39a93c18970884aa80bf2 /src/corelib/concurrent/qtconcurrentexception.cpp
parent7acefef29430532a95c5fe7a11578c03bb820fae (diff)
parent5203b315aae66ada8ced60fbce3064ad92551848 (diff)
downloadQt-63711cb855114b879c6bad192708bf6a19c31f32.zip
Qt-63711cb855114b879c6bad192708bf6a19c31f32.tar.gz
Qt-63711cb855114b879c6bad192708bf6a19c31f32.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: tst_qsharedpointer.cpp: fix compilation Fix compilation with QT_NO_DEBUG_STREAM QImage::fill() overloads that take QColor and Qt::GlobalColor qmake: qmakeDeleteCacheClear() function can be template now It is no longer necessary to check for QT_NO_MEMBER_TEMPLATES It is no longer necessary to check for QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION Fix MS Visual C++ 6.0 references in the documentation Remove obsolete code & workarounds for unsupported versions of MS Visual C++
Diffstat (limited to 'src/corelib/concurrent/qtconcurrentexception.cpp')
0 files changed, 0 insertions, 0 deletions