Merge remote-tracking branch 'origin/4.1'

Change-Id: I80f96f100046625f24b6ab5d13fdb05660365abc
2016-08-22 16:30:49 +02:00
parent f41b48ef5d e87da5a08a
commit 841778ed69
19 changed files with 78 additions and 32 deletions
--- a/src/plugins/clangcodemodel/clangutils.cpp
+++ b/src/plugins/clangcodemodel/clangutils.cpp
@@ -71,8 +71,10 @@ QStringList createClangOptions(const ProjectPart::Ptr &pPart, const QString &fil

 static QString getResourceDir()
 {
-    QDir dir(ICore::instance()->resourcePath() + QLatin1String("/cplusplus/clang/") +
-             QLatin1String(CLANG_VERSION) + QLatin1String("/include"));
+    QDir dir(ICore::libexecPath()
+                + QLatin1String("/clang/lib/clang/")
+                + QLatin1String(CLANG_VERSION)
+                + QLatin1String("/include"));
    if (!dir.exists() || !QFileInfo(dir, QLatin1String("stdint.h")).exists())
        dir = QDir(QLatin1String(CLANG_RESOURCE_DIR));
    return dir.canonicalPath();