From c44b7537cc2e50c820445238ee6b139881b23a61 Mon Sep 17 00:00:00 2001
From: Ivan Komissarov <ABBAPOH@gmail.com>
Date: Sat, 13 Feb 2021 22:09:34 +0100
Subject: Fix installation directory for the QtCreator component

We have several places (e.g. in docker files) that assume that QtCreator
is installed into /opt/Qt/Tools/QtCreator

This amends 7f1ee5c871699f89e7fdd741fcd1f0b2167a203b

Change-Id: Ifb122c105b95acd18c6e938009fd87529791d16d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 scripts/install-qt.sh | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/scripts/install-qt.sh b/scripts/install-qt.sh
index 649fdf21c..a26d4f3ff 100755
--- a/scripts/install-qt.sh
+++ b/scripts/install-qt.sh
@@ -292,11 +292,18 @@ rm -f "${HASH_FILEPATH}"
 
 for COMPONENT in ${COMPONENTS}; do
 
+    if [[ "${COMPONENT}" =~ "qtcreator" ]] && [[ "${HOST_OS}" != "mac_x64" ]]; then
+        UNPACK_DIR="${INSTALL_DIR}/Tools/QtCreator"
+        mkdir -p ${UNPACK_DIR}
+    else
+        UNPACK_DIR="${INSTALL_DIR}"
+    fi
+
     URL="$(compute_url ${COMPONENT})"
     echo "Downloading ${COMPONENT} ${URL}..." >&2
     curl --progress-bar -L -o ${DOWNLOAD_DIR}/package.7z ${URL} >&2
-    7z x -y -o${INSTALL_DIR} ${DOWNLOAD_DIR}/package.7z >/dev/null 2>&1
-    7z l -ba -slt -y ${DOWNLOAD_DIR}/package.7z | tr '\\' '/' | sed -n -e "s|^Path\ =\ |${INSTALL_DIR}/|p" >> "${HASH_FILEPATH}" 2>/dev/null
+    7z x -y -o${UNPACK_DIR} ${DOWNLOAD_DIR}/package.7z >/dev/null 2>&1
+    7z l -ba -slt -y ${DOWNLOAD_DIR}/package.7z | tr '\\' '/' | sed -n -e "s|^Path\ =\ |${UNPACK_DIR}/|p" >> "${HASH_FILEPATH}" 2>/dev/null
     rm -f ${DOWNLOAD_DIR}/package.7z
 
     #
@@ -318,21 +325,21 @@ for COMPONENT in ${COMPONENTS}; do
         fi
 
         if [ "${TARGET_PLATFORM}" == "android" ] && [ ! "${QT_VERSION}" \< "6.0.0" ]; then
-            CONF_FILE="${INSTALL_DIR}/${VERSION}/${SUBDIR}/bin/target_qt.conf"
+            CONF_FILE="${UNPACK_DIR}/${VERSION}/${SUBDIR}/bin/target_qt.conf"
             sed -i "s|target|../$TOOLCHAIN|g" "${CONF_FILE}"
             sed -i "/HostPrefix/ s|$|gcc_64|g" "${CONF_FILE}"
-            ANDROID_QMAKE_FILE="${INSTALL_DIR}/${VERSION}/${SUBDIR}/bin/qmake"
-            QMAKE_FILE="${INSTALL_DIR}/${VERSION}/gcc_64/bin/qmake"
+            ANDROID_QMAKE_FILE="${UNPACK_DIR}/${VERSION}/${SUBDIR}/bin/qmake"
+            QMAKE_FILE="${UNPACK_DIR}/${VERSION}/gcc_64/bin/qmake"
             sed -i "s|\/home\/qt\/work\/install\/bin\/qmake|$QMAKE_FILE|g" "${ANDROID_QMAKE_FILE}"
         else
-            CONF_FILE="${INSTALL_DIR}/${VERSION}/${SUBDIR}/bin/qt.conf"
+            CONF_FILE="${UNPACK_DIR}/${VERSION}/${SUBDIR}/bin/qt.conf"
             echo "[Paths]" > ${CONF_FILE}
             echo "Prefix = .." >> ${CONF_FILE}
         fi
 
         # Adjust the license to be able to run qmake
         # sed with -i requires intermediate file on Mac OS
-        PRI_FILE="${INSTALL_DIR}/${VERSION}/${SUBDIR}/mkspecs/qconfig.pri"
+        PRI_FILE="${UNPACK_DIR}/${VERSION}/${SUBDIR}/mkspecs/qconfig.pri"
         sed -i.bak 's/Enterprise/OpenSource/g' "${PRI_FILE}"
         sed -i.bak 's/licheck.*//g' "${PRI_FILE}"
         rm "${PRI_FILE}.bak"
@@ -342,9 +349,9 @@ for COMPONENT in ${COMPONENTS}; do
         echo $(dirname "${CONF_FILE}")
     elif [[ "${COMPONENT}" =~ "qtcreator" ]]; then
         if [ "${HOST_OS}" == "mac_x64" ]; then
-            echo "${INSTALL_DIR}/Qt Creator.app/Contents/MacOS"
+            echo "${UNPACK_DIR}/Qt Creator.app/Contents/MacOS"
         else
-            echo "${INSTALL_DIR}/bin"
+            echo "${UNPACK_DIR}/bin"
         fi
     fi
 
-- 
cgit v1.2.3