aboutsummaryrefslogtreecommitdiffstats
path: root/qbs
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2013-09-17 18:15:59 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2013-09-19 13:27:55 +0200
commit7e9a4131413e05b365c066a5476dc39f43935914 (patch)
treeafb352bcafc8a37c4395e3f2baeecb75876a74ec /qbs
parent2167788b3d9900e0eeded901ac30cd978f595c1b (diff)
Fix qbs build.
There was more stuff broken by the switch to Qt Quick 2 than were originally noticed, and the original fix was buggy as well. Change-Id: I2b3e0619af923c52aba809355ac271b67097adf1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qbs')
-rw-r--r--qbs/defaults.js13
1 files changed, 13 insertions, 0 deletions
diff --git a/qbs/defaults.js b/qbs/defaults.js
index d64429e3c9..23a51f80e8 100644
--- a/qbs/defaults.js
+++ b/qbs/defaults.js
@@ -9,3 +9,16 @@ function qtLibraryName(qbs, name)
}
return name;
}
+
+function versionIsAtLeast(actualVersion, expectedVersion)
+{
+ var actualVersionParts = actualVersion.split('.').map(function(item) { return parseInt(item, 10); });
+ var expectedVersionParts = expectedVersion.split('.').map(function(item) { return parseInt(item, 10); });
+ for (var i = 0; i < expectedVersionParts.length; ++i) {
+ if (actualVersionParts[i] > expectedVersionParts[i])
+ return true;
+ if (actualVersionParts[i] < expectedVersionParts[i])
+ return false;
+ }
+ return i === expectedVersionParts.length || expectedVersionParts[i] === 0;
+}