diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-06 03:40:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-06 03:40:25 (GMT) |
| commit | 63711cb855114b879c6bad192708bf6a19c31f32 (patch) | |
| tree | 02a0cba8fdceb031afa39a93c18970884aa80bf2 /qmake/option.cpp | |
| parent | 7acefef29430532a95c5fe7a11578c03bb820fae (diff) | |
| parent | 5203b315aae66ada8ced60fbce3064ad92551848 (diff) | |
| download | Qt-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 'qmake/option.cpp')
| -rw-r--r-- | qmake/option.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index 8db3797..27e7c18 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -621,7 +621,7 @@ Option::fixString(QString string, uchar flags) static QHash<FixStringCacheKey, QString> *cache = 0; if(!cache) { cache = new QHash<FixStringCacheKey, QString>; - qmakeAddCacheClear(qmakeDeleteCacheClear_QHashFixStringCacheKeyQString, (void**)&cache); + qmakeAddCacheClear(qmakeDeleteCacheClear<QHash<FixStringCacheKey, QString> >, (void**)&cache); } FixStringCacheKey cacheKey(string, flags); if(cache->contains(cacheKey)) { |