aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2016-06-01 03:29:52 -0700
committerJake Petroules <jake.petroules@qt.io>2016-06-02 08:19:19 +0000
commit161a751d53b97dd706ac0108432cdc71c4c05c70 (patch)
tree6b78ae39c59379a56b00fd76b3c534957b6737e2
parent942304f909e1bf1f299ab990e1bc6be08ce7c5ca (diff)
Don't warn about unknown Windows versions if no version is set.
Task-number: QBS-980 Change-Id: I87f7cccf5a0e99f4c1762c56680f66c1a1b058b3 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--share/qbs/modules/cpp/CppModule.qbs2
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs
index 45ca8bc26..715d66832 100644
--- a/share/qbs/modules/cpp/CppModule.qbs
+++ b/share/qbs/modules/cpp/CppModule.qbs
@@ -354,7 +354,7 @@ Module {
}
validator.validate();
- if (!WindowsUtils.isValidWindowsVersion(minimumWindowsVersion)) {
+ if (minimumWindowsVersion && !WindowsUtils.isValidWindowsVersion(minimumWindowsVersion)) {
console.warn("Unknown Windows version '" + minimumWindowsVersion
+ "'; expected one of: "
+ WindowsUtils.knownWindowsVersions().map(function (a) {