diff options
Diffstat (limited to 'scripts/install-qt.sh')
| -rwxr-xr-x | scripts/install-qt.sh | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/scripts/install-qt.sh b/scripts/install-qt.sh index 9a3595062..3105c99e4 100755 --- a/scripts/install-qt.sh +++ b/scripts/install-qt.sh @@ -223,10 +223,10 @@ if ${INSTALLATION_IS_VALID}; then fi MIRRORS="\ - http://download.qt.io \ http://ftp.acc.umu.se/mirror/qt.io/qtproject \ http://qt.mirrors.tds.net/qt \ http://ftp.fau.de/qtproject \ + http://download.qt.io \ " for MIRROR in ${MIRRORS}; do @@ -251,12 +251,24 @@ function compute_url(){ if [[ "${COMPONENT}" =~ "qtcreator" ]]; then + if [[ "${HOST_OS}" == "windows_x86" ]]; then + # newer QtC versions do not supported x86 version anymore + HOST_OS="windows_x64" + fi + SHORT_VERSION=${VERSION%??} BASE_URL="${MIRROR}/official_releases/qtcreator" REMOTE_PATH="${SHORT_VERSION}/${VERSION}/installer_source/${HOST_OS}/qtcreator.7z" echo "${BASE_URL}/${REMOTE_PATH}" return 0 + elif [[ "${COMPONENT}" =~ "mingw" ]]; then + REMOTE_BASE="tools_mingw/qt.tools.${TOOLCHAIN}${VERSION//./}" + REMOTE_PATH="$(${CURL} ${BASE_URL}/${REMOTE_BASE}/ | grep -o -E "[[:alnum:]_.\-]*7z" | grep -v "meta" | head -1)" + if [ ! -z "${REMOTE_PATH}" ]; then + echo "${BASE_URL}/${REMOTE_BASE}/${REMOTE_PATH}" + return 0 + fi else REMOTE_BASES=( # New repository format (>=6.0.0) @@ -364,6 +376,12 @@ for COMPONENT in ${COMPONENTS}; do # Print the directory so that the caller can # adjust the PATH variable. echo $(dirname "${CONF_FILE}") + elif [[ "${COMPONENT}" =~ "mingw" ]]; then + 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" + fi elif [[ "${COMPONENT}" =~ "qtcreator" ]]; then if [ "${HOST_OS}" == "mac_x64" ]; then echo "${UNPACK_DIR}/Qt Creator.app/Contents/MacOS" |