diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2024-04-30 11:52:13 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2024-04-30 14:37:34 +0300 |
| commit | 1076fe82682373aad23e1e43c826c7b596ddb7b1 (patch) | |
| tree | 14c5c23fb8ae17eb6ada6647263520fb1eb6863e /meta-boot2qt/files/configure-qtcreator.sh | |
| parent | bd1d51e12d9a734f81d64372a77d9f9ae7a57b65 (diff) | |
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
Pick-to: nanbield kirkstone
Change-Id: I262ac1468f565b4a3e9931f38bd1e767f1b235f2
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
Diffstat (limited to 'meta-boot2qt/files/configure-qtcreator.sh')
| -rwxr-xr-x | meta-boot2qt/files/configure-qtcreator.sh | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/meta-boot2qt/files/configure-qtcreator.sh b/meta-boot2qt/files/configure-qtcreator.sh index 081ac89e..da0135d3 100755 --- a/meta-boot2qt/files/configure-qtcreator.sh +++ b/meta-boot2qt/files/configure-qtcreator.sh @@ -36,7 +36,7 @@ MACHINE="" 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 @@ -44,9 +44,9 @@ while test -n "$1"; do "--remove") REMOVEONLY=1 ;; - "--qtcreator") + "--sdktool") shift - QTCREATOR=$1 + SDKTOOL=$1 ;; "--config") shift @@ -69,13 +69,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 |