From 409f7f226fd4b5dd99441bf466394d4ecde1441e Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@qt.io>
Date: Wed, 16 Nov 2022 12:10:06 +0100
Subject: 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>
---
 scripts/deployqtHelper_mac.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh
index cc09b80ad67..4109e6f31db 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" \
-- 
cgit v1.2.3