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>

8 files changed, 7 insertions, 5 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]
diff --git a/src/lib/qtprofilesetup/templates/QtModule.qbs b/src/lib/qtprofilesetup/templates/QtModule.qbs
index 159568bca..07618bf20 100644
--- a/src/lib/qtprofilesetup/templates/QtModule.qbs
+++ b/src/lib/qtprofilesetup/templates/QtModule.qbs
@@ -18,7 +18,7 @@ Module {
     property string libFilePathRelease
     property string libFilePath: Qt.core.qtBuildVariant === "debug"
                                  ? libFilePathDebug : libFilePathRelease
-    property string qtVersion: Qt.core.version
+    version: Qt.core.version
     property bool hasLibrary: true
     property bool isStaticLibrary: false
     property bool isPlugin: false
diff --git a/src/lib/qtprofilesetup/templates/core.qbs b/src/lib/qtprofilesetup/templates/core.qbs
index 7ed03a47f..325006cd7 100644
--- a/src/lib/qtprofilesetup/templates/core.qbs
+++ b/src/lib/qtprofilesetup/templates/core.qbs
@@ -25,7 +25,6 @@ Module {
     property stringList qdocEnvironment
     property path docPath
     property stringList helpGeneratorArgs: versionMajor >= 5 ? ["-platform", "minimal"] : []
-    property string version
     property var versionParts: version ? version.split('.').map(function(item) { return parseInt(item, 10); }) : []
     property int versionMajor: versionParts[0]
     property int versionMinor: versionParts[1]