diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2019-12-09 21:04:39 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-12-10 09:33:59 +0000 |
| commit | 761efa4df643571f564c59a303d99d0e7c434a97 (patch) | |
| tree | 98a0910ae74c079e733b07d747165bf864637f02 | |
| parent | f8c9a663fb2beda731c7a8d2b7ae62c4514b5f62 (diff) | |
Fix setting base profile for the QBS_AUTOTEST_PROFILE
Change-Id: I37587ea0a691560bc1f37fb4ee2525ef9657e7f0
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rwxr-xr-x | scripts/build-qbs-with-qbs.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/scripts/build-qbs-with-qbs.sh b/scripts/build-qbs-with-qbs.sh index f392ad405..f26d2222a 100755 --- a/scripts/build-qbs-with-qbs.sh +++ b/scripts/build-qbs-with-qbs.sh @@ -96,10 +96,13 @@ if [ -z "${QBS_AUTOTEST_PROFILE}" ]; then # was set. Otherwise setup-qt automatically uses the default # toolchain profile. if [ ! -z "${QBS_BUILD_PROFILE}" ]; then - QBS_BUILD_BASE_PROFILE=$(qbs config ${QBS_BUILD_PROFILE}.baseProfile | cut -d: -f2) - qbs run -p qbs_app ${BUILD_OPTIONS} -- config \ - ${RUN_OPTIONS} \ - ${QBS_AUTOTEST_PROFILE}.baseProfile ${QBS_BUILD_BASE_PROFILE} + QBS_BUILD_BASE_PROFILE=$(qbs config profiles.${QBS_BUILD_PROFILE}.baseProfile | cut -d: -f2) + if [ ! -z "${QBS_BUILD_BASE_PROFILE}" ]; then + echo "Setting base profile for ${QBS_AUTOTEST_PROFILE} to ${QBS_BUILD_BASE_PROFILE}" + qbs run -p qbs_app ${BUILD_OPTIONS} -- config \ + ${RUN_OPTIONS} \ + profiles.${QBS_AUTOTEST_PROFILE}.baseProfile ${QBS_BUILD_BASE_PROFILE} + fi fi # QBS_AUTOTEST_PROFILE has been added to the environment |