Merge remote-tracking branch 'origin/4.9'

Change-Id: I801042a53ae4d02d1891ea582ca9ea89b00d3181

3 files changed, 24 insertions, 22 deletions

diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri
index 4629aedaab..6c820dc36d 100644
--- a/src/shared/clang/clang_installation.pri
+++ b/src/shared/clang/clang_installation.pri
@@ -150,25 +150,6 @@ isEmpty(LLVM_INSTALL_DIR) {
 output = $$system($$llvm_config --version, lines)
 LLVM_VERSION = $$extractVersion($$output)
 
-!isEmpty(LLVM_VERSION) {
-    versionIsAtLeast($$LLVM_VERSION, 7, 0, 0): {
-        CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
-        ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \
-                       -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \
-                       -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \
-                       -lclangASTMatchers -lclangAST -lclangLex -lclangBasic
-    } else:versionIsAtLeast($$LLVM_VERSION, 6, 0, 0): {
-        CLANGFORMAT_LIBS=-lclangFormat -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
-        ALL_CLANG_LIBS=-lclangFormat -lclangTooling -lclangToolingCore \
-                       -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \
-                       -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \
-                       -lclangASTMatchers -lclangAST -lclangLex -lclangBasic
-    }
-
-    win32:CLANGFORMAT_LIBS += -lversion
-    win32:ALL_CLANG_LIBS += -lversion
-}
-
 isEmpty(LLVM_VERSION) {
     $$llvmWarningOrError(\
         "Cannot determine clang version. Set LLVM_INSTALL_DIR to build the Clang Code Model",\
@@ -204,6 +185,25 @@ isEmpty(LLVM_VERSION) {
 
     LLVM_STATIC_LIBS = $$split(LLVM_STATIC_LIBS_STRING, " ")
 
+    CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
+    exists($$CLANGFORMAT_MAIN_HEADER) {
+        versionIsAtLeast($$LLVM_VERSION, 7, 0, 0): {
+            CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
+            ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \
+                           -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \
+                           -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \
+                           -lclangASTMatchers -lclangAST -lclangLex -lclangBasic
+        } else:versionIsAtLeast($$LLVM_VERSION, 6, 0, 0): {
+            CLANGFORMAT_LIBS=-lclangFormat -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
+            ALL_CLANG_LIBS=-lclangFormat -lclangTooling -lclangToolingCore \
+                           -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \
+                           -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \
+                           -lclangASTMatchers -lclangAST -lclangLex -lclangBasic
+        }
+        win32:CLANGFORMAT_LIBS += -lversion
+    }
+    win32:ALL_CLANG_LIBS += -lversion
+
     LIBCLANG_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang-c/Index.h
     !exists($$LIBCLANG_MAIN_HEADER) {
         $$llvmWarningOrError(\
@@ -231,7 +231,9 @@ isEmpty(LLVM_VERSION) {
         warning("Clang LibTooling is disabled. Set QTC_ENABLE_CLANG_LIBTOOLING to enable it.")
     }
 
-    CLANGFORMAT_LIBS = -L$${LLVM_LIBDIR} $$CLANGFORMAT_LIBS $$LLVM_STATIC_LIBS
+    !isEmpty(CLANGFORMAT_LIBS) {
+        CLANGFORMAT_LIBS = -L$${LLVM_LIBDIR} $$CLANGFORMAT_LIBS $$LLVM_STATIC_LIBS
+    }
     ALL_CLANG_LIBS = -L$${LLVM_LIBDIR} $$ALL_CLANG_LIBS $$CLANG_LIB $$LLVM_STATIC_LIBS
 
     contains(QMAKE_DEFAULT_INCDIRS, $$LLVM_INCLUDEPATH): LLVM_INCLUDEPATH =
diff --git a/src/shared/proparser/ioutils.cpp b/src/shared/proparser/ioutils.cpp
index f678ea9fb0..302811cac4 100644
--- a/src/shared/proparser/ioutils.cpp
+++ b/src/shared/proparser/ioutils.cpp
@@ -106,8 +106,8 @@ QString IoUtils::resolvePath(const QString &baseDir, const QString &fileName)
         return QDir::cleanPath(fileName);
 #ifdef Q_OS_WIN // Add drive to otherwise-absolute path:
     if (fileName.at(0).unicode() == '/' || fileName.at(0).unicode() == '\\') {
-        Q_ASSERT(isAbsolutePath(baseDir));
-        return QDir::cleanPath(baseDir.left(2) + fileName);
+        return isAbsolutePath(baseDir) ? QDir::cleanPath(baseDir.left(2) + fileName)
+                                       : QDir::cleanPath(fileName);
     }
 #endif // Q_OS_WIN
     return QDir::cleanPath(baseDir + QLatin1Char('/') + fileName);
diff --git a/src/shared/qbs b/src/shared/qbs
-Subproject bceae1097f6a57f1339ea3a4e6827d6195860d3
+Subproject 50eb4d183ccb526874cefe73c7f4c2129769aa4