diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2016-10-17 15:55:13 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-10-19 08:05:07 +0000 |
commit | 91242e37603bab2c2adcfbc34fd9731b668ae6f6 (patch) | |
tree | 5262ae723266faf2478477ed8269d3d8c3e2c806 /share | |
parent | bfd950260a2cd2c290ffaa5593620202eb5b080c (diff) |
Modules: Adapt to introduction of built-in "version" property
- Remove redefinitions of the property.
- Set the property, where applicable.
Change-Id: Ie3f4bd3c4cc9b809667287045c10b22ff6b71e21
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'share')
-rw-r--r-- | share/qbs/modules/cpp/CppModule.qbs | 1 | ||||
-rw-r--r-- | share/qbs/modules/ib/IBModule.qbs | 1 | ||||
-rw-r--r-- | share/qbs/modules/java/JavaModule.qbs | 1 | ||||
-rw-r--r-- | share/qbs/modules/nsis/NSISModule.qbs | 2 | ||||
-rw-r--r-- | share/qbs/modules/typescript/TypeScriptModule.qbs | 2 | ||||
-rw-r--r-- | share/qbs/modules/wix/WiXModule.qbs | 2 |
6 files changed, 6 insertions, 3 deletions
diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs index 2459a419b..eab5400d0 100644 --- a/share/qbs/modules/cpp/CppModule.qbs +++ b/share/qbs/modules/cpp/CppModule.qbs @@ -35,6 +35,7 @@ import qbs.WindowsUtils Module { condition: false + version: compilerVersion property string compilerVersion: [compilerVersionMajor, compilerVersionMinor, compilerVersionPatch].join(".") property int compilerVersionMajor diff --git a/share/qbs/modules/ib/IBModule.qbs b/share/qbs/modules/ib/IBModule.qbs index 50a9d22f5..c0e80fe9d 100644 --- a/share/qbs/modules/ib/IBModule.qbs +++ b/share/qbs/modules/ib/IBModule.qbs @@ -72,6 +72,7 @@ Module { property string compiledNibSuffix: ".nib" property string compiledStoryboardSuffix: ".storyboardc" + version: ibtoolVersion property string ibtoolVersion: { return Ib.ibtoolVersion(ibtoolPath); } property var ibtoolVersionParts: ibtoolVersion ? ibtoolVersion.split('.').map(function(item) { return parseInt(item, 10); }) : [] property int ibtoolVersionMajor: ibtoolVersionParts[0] diff --git a/share/qbs/modules/java/JavaModule.qbs b/share/qbs/modules/java/JavaModule.qbs index 888939eeb..d1d92c835 100644 --- a/share/qbs/modules/java/JavaModule.qbs +++ b/share/qbs/modules/java/JavaModule.qbs @@ -57,6 +57,7 @@ Module { property path jdkPath: jdk.path + version: compilerVersion property string compilerVersion: jdk.version ? jdk.version[1] : undefined property var compilerVersionParts: compilerVersion ? compilerVersion.split(/[\._]/).map(function(item) { return parseInt(item, 10); }) : [] property int compilerVersionMajor: compilerVersionParts[0] diff --git a/share/qbs/modules/nsis/NSISModule.qbs b/share/qbs/modules/nsis/NSISModule.qbs index 9c147d874..c4a1339ea 100644 --- a/share/qbs/modules/nsis/NSISModule.qbs +++ b/share/qbs/modules/nsis/NSISModule.qbs @@ -39,7 +39,7 @@ Module { property path toolchainInstallPath: Utilities.getNativeSetting(registryKey) - property string version: (versionMajor !== undefined && versionMinor !== undefined) ? (versionMajor + "." + versionMinor) : undefined + version: (versionMajor !== undefined && versionMinor !== undefined) ? (versionMajor + "." + versionMinor) : undefined property var versionParts: [ versionMajor, versionMinor, versionPatch, versionBuild ] property int versionMajor: Utilities.getNativeSetting(registryKey, "VersionMajor") property int versionMinor: Utilities.getNativeSetting(registryKey, "VersionMinor") diff --git a/share/qbs/modules/typescript/TypeScriptModule.qbs b/share/qbs/modules/typescript/TypeScriptModule.qbs index ece4d8653..7cbd02265 100644 --- a/share/qbs/modules/typescript/TypeScriptModule.qbs +++ b/share/qbs/modules/typescript/TypeScriptModule.qbs @@ -57,7 +57,7 @@ Module { property path toolchainLibDirName: (versionMajor > 1 || (versionMajor === 1 && versionMinor >= 6)) ? "lib" : "bin" property path toolchainLibInstallPath: FileInfo.joinPaths(nodejs.packageManagerRootPath, "typescript", toolchainLibDirName) - property string version: tsc.version ? tsc.version[2] : undefined + version: tsc.version ? tsc.version[2] : undefined property var versionParts: version ? version.split('.').map(function(item) { return parseInt(item, 10); }) : [] property int versionMajor: versionParts[0] property int versionMinor: versionParts[1] diff --git a/share/qbs/modules/wix/WiXModule.qbs b/share/qbs/modules/wix/WiXModule.qbs index 7663212b2..1ef816f87 100644 --- a/share/qbs/modules/wix/WiXModule.qbs +++ b/share/qbs/modules/wix/WiXModule.qbs @@ -44,7 +44,7 @@ Module { property path toolchainInstallPath: wixProbe.path property path toolchainInstallRoot: wixProbe.root - property string version: wixProbe.version + version: wixProbe.version property var versionParts: version ? version.split('.').map(function(item) { return parseInt(item, 10); }) : [] property int versionMajor: versionParts[0] property int versionMinor: versionParts[1] |