diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-11-20 16:27:19 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-11-21 12:31:21 +0000 |
| commit | 428cc6188fb4f99bca8522530ed400357cfe38ec (patch) | |
| tree | 5091edd0ee1184d50ddc2a8bf6ef305a9481e8d2 /qbs-resources | |
| parent | 04df7bbcf1a346c2e2bf15755790c8554a0b2c96 (diff) | |
qbs build: Fix look-up of qbs executable by autotests
The code worked only if qbs.installPrefix was empty.
Change-Id: I9ba69f10c976b4a2b71ae4934c4cdac58895882a
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qbs-resources')
| -rw-r--r-- | qbs-resources/imports/QbsAutotest.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qbs-resources/imports/QbsAutotest.qbs b/qbs-resources/imports/QbsAutotest.qbs index 3dac063f2..78db72d11 100644 --- a/qbs-resources/imports/QbsAutotest.qbs +++ b/qbs-resources/imports/QbsAutotest.qbs @@ -30,7 +30,7 @@ QtApplication { } cpp.rpaths: [FileInfo.joinPaths(qbs.installRoot, qbs.installPrefix, qbsbuildconfig.libDirName)] qbs.commonRunEnvironment: ({ - "QBS_INSTALL_ROOT": qbs.installRoot + "QBS_INSTALL_DIR": FileInfo.joinPaths(qbs.installRoot, qbs.installPrefix) }) Group { fileTagsFilter: product.type |