From 2ed089ba7f4485adb385fdd2106149a8192104ca Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Wed, 19 Apr 2017 10:11:48 +0200 Subject: [PATCH] Clang: Fix path to intrinsics dir ...which got lost in commit 1e3f2eec8dc59c1fc113716b380f492a5c207459 Clang: Consolidate all ClangCompilerOptionsBuilder into one implementation This will fix SOFT ASSERT: "!resourceDir.isEmpty()" in file C:\work\build\qt-creator\src\plugins\cpptools\clangcompileroptionsbuilder.cpp, line 119 Change-Id: Ie0301517eca580b4907bbcd8f524775f2b0bedb8 Reviewed-by: Eike Ziller Reviewed-by: David Schulz --- src/plugins/cpptools/clangcompileroptionsbuilder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/cpptools/clangcompileroptionsbuilder.cpp b/src/plugins/cpptools/clangcompileroptionsbuilder.cpp index 7508b3d63e9..160bf6b4c6c 100644 --- 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