diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2021-09-21 22:12:23 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2021-09-22 12:41:31 +0000 |
| commit | 59e983d5d998d62930e590264ff70314b84f3a90 (patch) | |
| tree | 75f2976badcae4b1733b1448a6a25f27b281574e /scripts/install-qt.sh | |
| parent | f78fa96ae98d3fe1772e0b710392a73b0b37760e (diff) | |
install-qt.sh: A number of small fixes
* Starting with Qt 6.1.2, Qt for macOS is installed to a subdirectory called
"macos" instead of "clang_64".
* Fixed the version variable used in Android related condition.
* Fixed the path printed for 32-bit MinGW installations.
Change-Id: I87d339caab8fa549efff3963f75416a06b4e9923
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'scripts/install-qt.sh')
| -rwxr-xr-x | scripts/install-qt.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/install-qt.sh b/scripts/install-qt.sh index 3105c99e4..26ffc5996 100755 --- a/scripts/install-qt.sh +++ b/scripts/install-qt.sh @@ -349,11 +349,13 @@ for COMPONENT in ${COMPONENTS}; do SUBDIR="${TOOLCHAIN/win32_/}" elif [[ "${TOOLCHAIN}" =~ "any" ]] && [[ "${TARGET_PLATFORM}" == "android" ]]; then SUBDIR="android" + elif [ "${HOST_OS}" == "mac_x64" ] && [ ! "${VERSION}" \< "6.1.2" ]; then + SUBDIR="macos" else SUBDIR="${TOOLCHAIN}" fi - if [ "${TARGET_PLATFORM}" == "android" ] && [ ! "${QT_VERSION}" \< "6.0.0" ]; then + if [ "${TARGET_PLATFORM}" == "android" ] && [ ! "${VERSION}" \< "6.0.0" ]; then 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}" @@ -380,7 +382,7 @@ for COMPONENT in ${COMPONENTS}; do if [[ "${TOOLCHAIN}" =~ "win64_mingw" ]]; then echo "${UNPACK_DIR}/Tools/mingw${VERSION//./}_64/bin" elif [[ "${TOOLCHAIN}" =~ "win32_mingw" ]]; then - echo "${UNPACK_DIR}/Tools/mingw${VERSION//./}/bin" + echo "${UNPACK_DIR}/Tools/mingw${VERSION//./}_32/bin" fi elif [[ "${COMPONENT}" =~ "qtcreator" ]]; then if [ "${HOST_OS}" == "mac_x64" ]; then |