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 /src | |
| 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 'src')
| -rw-r--r-- | src/lib/qtprofilesetup/templates/QtModule.qbs | 2 | ||||
| -rw-r--r-- | src/lib/qtprofilesetup/templates/core.qbs | 1 |
2 files changed, 1 insertions, 2 deletions
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] |