diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-07-05 11:36:46 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-07-06 17:19:29 +0000 |
| commit | 86088fe1cf778184886722febb81099bc3d7da01 (patch) | |
| tree | e840f2fc96037860092b2480d95cebd8b75cdad5 /share/qbs/imports/qbs/base | |
| parent | 2bd23427f19244282e12eab2c80438aad3058d92 (diff) | |
Utilize ModUtils.artifactInstalledFilePath instead of duplicating
Incidentally, this properly handles installSourceBase in AutotestRunner.
Change-Id: Ifb01aa249a87771b3a9bca3f0c05e86d128d0e94
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/imports/qbs/base')
| -rw-r--r-- | share/qbs/imports/qbs/base/AutotestRunner.qbs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/share/qbs/imports/qbs/base/AutotestRunner.qbs b/share/qbs/imports/qbs/base/AutotestRunner.qbs index 121493de8..426b1ee8f 100644 --- a/share/qbs/imports/qbs/base/AutotestRunner.qbs +++ b/share/qbs/imports/qbs/base/AutotestRunner.qbs @@ -56,12 +56,8 @@ Product { prepare: { var commandFilePath; var installed = input.moduleProperty("qbs", "install"); - if (installed) { - commandFilePath = FileInfo.joinPaths(input.moduleProperty("qbs", "installRoot"), - input.moduleProperty("qbs", "installPrefix"), - input.moduleProperty("qbs", "installDir"), - input.fileName); - } + if (installed) + commandFilePath = ModUtils.artifactInstalledFilePath(input); if (!commandFilePath || !File.exists(commandFilePath)) commandFilePath = input.filePath; var fullCommandLine = product.wrapper |