diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2022-11-16 12:08:54 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2022-11-16 15:35:01 +0000 |
| commit | 0d2cb70fd6bded27e97b62ceec24902330bc78f0 (patch) | |
| tree | 7d2057ac28a07525794db4b7f35aeae96250d2a8 /scripts | |
| parent | 301e7398d9c494cc3fc6ca7037fb96572bf2e072 (diff) | |
qml2puppet: fix broken deployqtHelper_mac.sh
The extra subdirectory "qmldesigner" was removed
in cmake build scripts by last refactoring.
For other ui helper tools in libexec is already a
working qt.conf which can be reused.
Task-number: QDS-8308
Change-Id: I7e98d0187cf2748298da263e55a64918cbb6b2c0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index a4afd7f20a..cc09b80ad6 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -74,12 +74,6 @@ if [ ! -f "$libexec_path/ios/qt.conf" ]; then cp -f "$(dirname "${BASH_SOURCE[0]}")/../dist/installer/mac/ios_qt.conf" "$libexec_path/ios/qt.conf" || exit 1 fi -# copy qml2puppet's qt.conf -if [ ! -f "$libexec_path/qmldesigner/qt.conf" ]; then - echo "- Copying libexec/qmldesigner/qt.conf" - cp -f "$(dirname "${BASH_SOURCE[0]}")/../dist/installer/mac/qmldesigner_qt.conf" "$libexec_path/qmldesigner/qt.conf" || exit 1 -fi - # copy Qt translations # check for known existing translation to avoid copying multiple times if [ ! -f "$resource_path/translations/qt_de.qm" ]; then @@ -114,10 +108,7 @@ fi if [ ! -d "$app_path/Contents/Frameworks/QtCore.framework" ]; then - qml2puppetapp="$libexec_path/qmldesigner/qml2puppet" - if [ -f "$qml2puppetapp" ]; then - qml2puppetArgument="-executable=$qml2puppetapp" - fi + echo "- Running macdeployqt ($bin_src/macdeployqt)" qbsapp="$app_path/Contents/MacOS/qbs" if [ -f "$qbsapp" ]; then @@ -131,7 +122,10 @@ if [ ! -d "$app_path/Contents/Frameworks/QtCore.framework" ]; then "-executable=$libexec_path/qbs_processlauncher") fi - echo "- Running macdeployqt ($bin_src/macdeployqt)" + qml2puppetapp="$libexec_path/qml2puppet" + if [ -f "$qml2puppetapp" ]; then + qml2puppetArgument="-executable=$qml2puppetapp" + fi "$bin_src/macdeployqt" "$app_path" \ "-executable=$app_path/Contents/MacOS/qtdiag" \ |