Commit e7ecb490 authored by Nikolai Kosjar's avatar Nikolai Kosjar

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: default avatarEike Ziller <eike.ziller@digia.com>
parent f7ac0adf
......@@ -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);
......
......@@ -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());
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment