diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-11-10 13:37:08 +0100 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-11-10 19:14:51 +0000 |
| commit | 18ea9077c0aff50ae1d891bea4d4bbe2ba20bab7 (patch) | |
| tree | 83edbd92f02caa6756b8ecaf602f6eb95088907d | |
| parent | 28ba269356a0f3cfe4f937ff45c3ecd3d4da8e9c (diff) | |
Use a Probe in the ib module
Task-number: QBS-1033
Change-Id: Ie37a15c884c1573ae69fda2aa256286c31f611e2
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| -rw-r--r-- | share/qbs/modules/ib/IBModule.qbs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/share/qbs/modules/ib/IBModule.qbs b/share/qbs/modules/ib/IBModule.qbs index c0e80fe9d..f0206dd4c 100644 --- a/share/qbs/modules/ib/IBModule.qbs +++ b/share/qbs/modules/ib/IBModule.qbs @@ -39,6 +39,16 @@ import 'ib.js' as Ib Module { Depends { name: "xcode"; required: false } + Probe { + id: ibProbe + property string toolPath: ibtoolPath // input + property string toolVersion // output + configure: { + toolVersion = Ib.ibtoolVersion(toolPath); + found = true; + } + } + condition: qbs.hostOS.contains("darwin") && qbs.targetOS.contains("darwin") property bool warnings: true @@ -73,7 +83,7 @@ Module { property string compiledStoryboardSuffix: ".storyboardc" version: ibtoolVersion - property string ibtoolVersion: { return Ib.ibtoolVersion(ibtoolPath); } + property string ibtoolVersion: ibProbe.toolVersion property var ibtoolVersionParts: ibtoolVersion ? ibtoolVersion.split('.').map(function(item) { return parseInt(item, 10); }) : [] property int ibtoolVersionMajor: ibtoolVersionParts[0] property int ibtoolVersionMinor: ibtoolVersionParts[1] |