From 885a41bc23d59cc9ae2c405ba8f1995b46e67332 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 30 Apr 2024 11:52:13 +0300
Subject: configure-qtcreator: Fix path to sdktool

QtCreator and sdktool are now separate components in the SDK
installation. Use the new path by default and change the argument
that can be used to give full path to the sdktool binary.

Fixes: QTBUG-124612
Change-Id: I262ac1468f565b4a3e9931f38bd1e767f1b235f2
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 1076fe82682373aad23e1e43c826c7b596ddb7b1)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
---
 meta-boot2qt/files/configure-qtcreator.sh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/meta-boot2qt/files/configure-qtcreator.sh b/meta-boot2qt/files/configure-qtcreator.sh
index 7a899fa0..04b5cc68 100755
--- a/meta-boot2qt/files/configure-qtcreator.sh
+++ b/meta-boot2qt/files/configure-qtcreator.sh
@@ -35,7 +35,7 @@ CONFIG=""
 
 printUsage ()
 {
-    echo "Usage: $0 --config <environment-setup-file> [--remove] [--qtcreator <path>] [--name <basename>]"
+    echo "Usage: $0 --config <environment-setup-file> [--remove] --sdktool <path>] [--name <basename>]"
 }
 
 while test -n "$1"; do
@@ -43,9 +43,9 @@ while test -n "$1"; do
     "--remove")
       REMOVEONLY=1
       ;;
-    "--qtcreator")
+    "--sdktool")
       shift
-      QTCREATOR=$1
+      SDKTOOL=$1
       ;;
     "--config")
       shift
@@ -68,13 +68,11 @@ if [ ! -f "$CONFIG" ]; then
    exit 1
 fi
 
-if [ -z "${QTCREATOR}" ]; then
-    SDKTOOL="${HOME}/Qt/Tools/QtCreator/libexec/qtcreator/sdktool"
-else
-    SDKTOOL="${QTCREATOR}/libexec/qtcreator/sdktool"
+if [ -z "${SDKTOOL}" ]; then
+    SDKTOOL="${HOME}/Qt/Tools/sdktool/libexec/qtcreator/sdktool"
 fi
 if [ ! -x ${SDKTOOL} ]; then
-    echo "Cannot find 'sdktool' from QtCreator"
+    echo "Cannot find 'sdktool'"
     printUsage
     exit 1
 fi
-- 
cgit v1.2.3