diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2022-11-16 12:10:06 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2022-11-17 14:21:53 +0000 |
| commit | 409f7f226fd4b5dd99441bf466394d4ecde1441e (patch) | |
| tree | 419551a70516de3780067f86f20ed640bb62fa27 /scripts | |
| parent | 04864bd0d1fa26b323c84ae16b25833b1923df4d (diff) | |
deployqtHelper_mac.sh: make sdktool optional
Silents the warning about not existing sdktool
in QtDesignStudio build.
Change-Id: Ia8e3f341936f4b20d340f9c66a5da3d01f14bccf
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
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" \ |