diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2022-12-14 15:29:20 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2022-12-14 14:30:09 +0000 |
| commit | 7f234ed768075dc14ea3b74f4531349851182aa5 (patch) | |
| tree | 25545aaae506361bfb3704583038977e28c7de62 /scripts | |
| parent | a3fe24d1920806e2307b754d42959ba3d891c5cc (diff) | |
| parent | 249c3561cbccb978889b738f2d0ce8e41a1ac371 (diff) | |
Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp
src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.cpp
Change-Id: Ieda6242b845387100022b08251283891fb0fbda7
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index cc09b80ad6..4109e6f31d 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -126,11 +126,15 @@ if [ ! -d "$app_path/Contents/Frameworks/QtCore.framework" ]; then if [ -f "$qml2puppetapp" ]; then qml2puppetArgument="-executable=$qml2puppetapp" fi + sdktoolapp="$libexec_path/sdktool" + if [ -f "$sdktoolapp" ]; then + sdktoolArgument="-executable=$sdktoolapp" + fi "$bin_src/macdeployqt" "$app_path" \ "-executable=$app_path/Contents/MacOS/qtdiag" \ "-executable=$libexec_path/qtpromaker" \ - "-executable=$libexec_path/sdktool" \ + "$sdktoolArgument" \ "-executable=$libexec_path/ios/iostool" \ "-executable=$libexec_path/buildoutputparser" \ "-executable=$libexec_path/cpaster" \ |