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

Merge remote-tracking branch 'origin/3.1'

Browse Source 
Conflicts:
	src/plugins/clangcodemodel/test/clangcompletion_test.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/projectexplorer/projectexplorer.pro
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
	src/plugins/vcsbase/vcsplugin.cpp
	src/shared/qbs

Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a
This commit is contained in:
Eike Ziller
2014-05-16 16:54:50 +02:00
parent d46a73eacf 1398480f3a
commit 6d1cc58697
64 changed files with 1227 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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