Merge remote-tracking branch 'origin/4.3'

Change-Id: I44511e06986b7df6007be7daf7051c895a10794b
2017-04-21 15:29:27 +02:00
parent ac86b2e8dd 1891af4b07
commit dae2556d2f
49 changed files with 191 additions and 151 deletions
--- a/src/plugins/cpptools/clangcompileroptionsbuilder.cpp
+++ b/src/plugins/cpptools/clangcompileroptionsbuilder.cpp
@@ -38,7 +38,7 @@ namespace CppTools {
 static QString creatorResourcePath()
 {
 #ifndef UNIT_TESTS
-    return Core::ICore::instance()->resourcePath();
+    return Core::ICore::instance()->libexecPath();
 #else
    return QString();
 #endif