diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-qbs-with-qbs.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/scripts/build-qbs-with-qbs.sh b/scripts/build-qbs-with-qbs.sh index 5956f1cff..503f3fbff 100755 --- a/scripts/build-qbs-with-qbs.sh +++ b/scripts/build-qbs-with-qbs.sh @@ -89,9 +89,16 @@ if [ -z "${QBS_AUTOTEST_PROFILE}" ]; then ${RUN_OPTIONS} \ "${QMAKE_PATH:-$(which qmake)}" ${QBS_AUTOTEST_PROFILE} - qbs run -p qbs_app ${BUILD_OPTIONS} -- config \ - ${RUN_OPTIONS} \ - ${QBS_AUTOTEST_PROFILE}.baseProfile gcc + # Make sure that the Qt profile uses the same toolchain profile + # that was used for building in case a custom QBS_BUILD_PROFILE + # 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} + fi # QBS_AUTOTEST_PROFILE has been added to the environment # which requires a resolve step |