diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-04-28 10:56:06 -0400 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-05-02 14:30:00 +0200 |
| commit | e7ecb490e6cefe347e7f6a039175dcb4f85b178d (patch) | |
| tree | cd7633e14c1133cc1b185e01aa3ea0baf5321aac | |
| parent | f7ac0adf7f0caf5235b812a6e61213a4e7791d10 (diff) | |
| download | qt-creator-e7ecb490e6cefe347e7f6a039175dcb4f85b178d.tar.gz | |
Clang: Compile fix for Qt 4
pchmanager.cpp:325:21: error: 'CppTools::ProjectPart::Ptr' has no member
named 'reset' projectPart.reset();
clangcompletion_test.cpp:305:59: error: no viable conversion from
'QLatin1Char' to 'const QString'
.arg(text).arg(texts.join(QLatin1Char(','))));
Task-Number: QTCREATORBUG-12122
Change-Id: Ie591594da1e3d357e38efe216d758f15ad6c2cd2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| -rw-r--r-- | src/plugins/clangcodemodel/pchmanager.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/clangcodemodel/test/clangcompletion_test.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/clangcodemodel/pchmanager.cpp b/src/plugins/clangcodemodel/pchmanager.cpp index 2702ecd60f..280dde4c6b 100644 --- a/src/plugins/clangcodemodel/pchmanager.cpp +++ b/src/plugins/clangcodemodel/pchmanager.cpp @@ -322,7 +322,7 @@ void PchManager::doPchInfoUpdateFuzzy(QFutureInterface<void> &future, getPrefixFileKind(objc.value(pch, false), cplusplus.value(pch, false)); QStringList options = Utils::createClangOptions(projectPart, prefixFileKind); - projectPart.reset(); + projectPart.clear(); PchManager *pchManager = PchManager::instance(); PchInfo::Ptr pchInfo = pchManager->findMatchingPCH(pch, options, true); diff --git a/src/plugins/clangcodemodel/test/clangcompletion_test.cpp b/src/plugins/clangcodemodel/test/clangcompletion_test.cpp index c9f3bc8217..9368cecb89 100644 --- a/src/plugins/clangcodemodel/test/clangcompletion_test.cpp +++ b/src/plugins/clangcodemodel/test/clangcompletion_test.cpp @@ -302,7 +302,7 @@ void ClangCodeModelPlugin::test_ObjC_hints() QVERIFY2(hint == ccr.hint(), hintError.arg(ccr.hint()).toAscii()); } const QString textError(QString::fromLatin1("Text '%1' not found in set %2") - .arg(text).arg(texts.join(QLatin1Char(',')))); + .arg(text).arg(texts.join(QLatin1String(",")))); QVERIFY2(hasText, textError.toAscii()); } } |