feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Compile fix for Qt 4

Browse Source 
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>
This commit is contained in:
Nikolai Kosjar
2014-04-28 10:56:06 -04:00
parent f7ac0adf7f
commit e7ecb490e6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangcodemodel/pchmanager.cpp
View File

@@ -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);

2
src/plugins/clangcodemodel/test/clangcompletion_test.cpp
View File

@@ -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());
}
}