Merge remote-tracking branch 'origin/4.6'

Change-Id: I49e8b8442e2b5edffbea19cb2bba97443ebc3d2a

5 files changed, 20 insertions, 12 deletions

diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs
index ef19ce4987..fc6c2502e4 100644
--- a/qbs/imports/QtcProduct.qbs
+++ b/qbs/imports/QtcProduct.qbs
@@ -22,18 +22,22 @@ Product {
     Depends { name: product.name + " dev headers"; required: false }
     Depends { name: "Qt.core"; versionAtLeast: "5.6.2" }
 
-    Properties {
-        condition: Utilities.versionCompare(Qt.core.version, "5.7") < 0
-        cpp.minimumMacosVersion: project.minimumMacosVersion
-    }
+    // TODO: Should fall back to what came from Qt.core for Qt < 5.7, but we cannot express that
+    //       atm. Conditionally pulling in a module that sets the property is also not possible,
+    //       because conflicting scalar values would be reported (QBS-1225 would fix that).
+    cpp.minimumMacosVersion: project.minimumMacosVersion
 
     Properties {
         condition: qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang")
         cpp.cxxFlags: base.concat(["-Wno-noexcept-type"])
     }
+    Properties {
+        condition: qbs.toolchain.contains("msvc")
+        cpp.cxxFlags: base.concat(["/w44996"])
+    }
     cpp.cxxLanguageVersion: "c++14"
     cpp.defines: qtc.generalDefines
-    cpp.minimumWindowsVersion: qbs.architecture === "x86" ? "5.1" : "5.2"
+    cpp.minimumWindowsVersion: "6.1"
     cpp.useCxxPrecompiledHeader: useNonGuiPchFile || useGuiPchFile
     cpp.visibility: "minimal"
 
diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js
index 3b74066562..29d093dcad 100644
--- a/qbs/modules/libclang/functions.js
+++ b/qbs/modules/libclang/functions.js
@@ -29,7 +29,7 @@ function isSuitableLLVMConfig(llvmConfigCandidate, qtcFunctions)
     return false;
 }
 
-function llvmConfig(qbs, qtcFunctions)
+function llvmConfig(hostOS, qtcFunctions)
 {
     var llvmInstallDirFromEnv = Environment.getEnv("LLVM_INSTALL_DIR")
     var llvmConfigVariants = [
@@ -37,7 +37,7 @@ function llvmConfig(qbs, qtcFunctions)
     ];
 
     // Prefer llvm-config* from LLVM_INSTALL_DIR
-    var suffix = qbs.hostOS.contains("windows") ? ".exe" : "";
+    var suffix = hostOS.contains("windows") ? ".exe" : "";
     if (llvmInstallDirFromEnv) {
         for (var i = 0; i < llvmConfigVariants.length; ++i) {
             var variant = llvmInstallDirFromEnv + "/bin/" + llvmConfigVariants[i] + suffix;
@@ -48,7 +48,7 @@ function llvmConfig(qbs, qtcFunctions)
 
     // Find llvm-config* in PATH
     var pathListString = Environment.getEnv("PATH");
-    var separator = qbs.hostOS.contains("windows") ? ";" : ":";
+    var separator = hostOS.contains("windows") ? ";" : ":";
     var pathList = pathListString.split(separator);
     for (var i = 0; i < llvmConfigVariants.length; ++i) {
         for (var j = 0; j < pathList.length; ++j) {
diff --git a/qbs/modules/libclang/libclang.qbs b/qbs/modules/libclang/libclang.qbs
index e4253cc105..3b68faa0bb 100644
--- a/qbs/modules/libclang/libclang.qbs
+++ b/qbs/modules/libclang/libclang.qbs
@@ -9,6 +9,9 @@ Module {
     Probe {
         id: clangProbe
 
+        property stringList hostOS: qbs.hostOS
+        property stringList targetOS: qbs.targetOS
+
         property string llvmConfig
         property string llvmVersion
         property string llvmIncludeDir
@@ -21,12 +24,12 @@ Module {
         property string llvmBuildMode
 
         configure: {
-            llvmConfig = ClangFunctions.llvmConfig(qbs, QtcFunctions);
+            llvmConfig = ClangFunctions.llvmConfig(hostOS, QtcFunctions);
             llvmVersion = ClangFunctions.version(llvmConfig);
             llvmIncludeDir = ClangFunctions.includeDir(llvmConfig);
             llvmLibDir = ClangFunctions.libDir(llvmConfig);
-            llvmLibs = ClangFunctions.libraries(qbs.targetOS);
-            llvmToolingLibs = ClangFunctions.toolingLibs(llvmConfig, qbs.targetOS);
+            llvmLibs = ClangFunctions.libraries(targetOS);
+            llvmToolingLibs = ClangFunctions.toolingLibs(llvmConfig, targetOS);
             llvmBuildMode = ClangFunctions.buildMode(llvmConfig);
             var toolingParams = ClangFunctions.toolingParameters(llvmConfig);
             llvmToolingDefines = toolingParams.defines;
diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
index 492a6fe457..6c77099906 100644
--- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
+++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
@@ -14,7 +14,7 @@ Module {
             ? ["@loader_path/" + FileInfo.relativePath('/' + appInstallDir, '/' + libInstallDir)]
             : ["$ORIGIN/..", "$ORIGIN/../" + qtc.ide_library_path]
     property string resourcesInstallDir: qtc.ide_data_path + "/qbs"
-    property string pluginsInstallDir: qtc.ide_plugin_path
+    property string pluginsInstallDir: qtc.ide_plugin_path + "/qbs/plugins"
     property string appInstallDir: qtc.ide_bin_path
     property string libexecInstallDir: qtc.ide_libexec_path
     property bool installHtml: false
diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs
index 416e27e4e8..f3f3bf7827 100644
--- a/qbs/modules/qtc/qtc.qbs
+++ b/qbs/modules/qtc/qtc.qbs
@@ -85,6 +85,7 @@ Module {
         "QT_USE_FAST_OPERATOR_PLUS",
         "QT_USE_FAST_CONCATENATION",
     ].concat(testsEnabled ? ["WITH_TESTS"] : [])
+     .concat(qbs.toolchain.contains("msvc") ? ["_CRT_SECURE_NO_WARNINGS"] : [])
 
     Rule {
         condition: make_dev_package