diff options
Diffstat (limited to 'scripts/install-qt.sh')
| -rwxr-xr-x | scripts/install-qt.sh | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/scripts/install-qt.sh b/scripts/install-qt.sh index 2cc895e07..5799fee02 100755 --- a/scripts/install-qt.sh +++ b/scripts/install-qt.sh @@ -45,7 +45,7 @@ usage: install-qt [options] [components] Examples ./install-qt.sh --version 5.13.1 qtbase - ./install-qt.sh --version 5.14.0 --target android --toolchain any qtbase qtscript + ./install-qt.sh --version 5.14.0 --target android --toolchain any qtbase Positional arguments components @@ -261,7 +261,7 @@ function compute_url(){ echo "${BASE_URL}/${REMOTE_PATH}" return 0 elif [[ "${COMPONENT}" =~ "mingw" ]]; then - REMOTE_BASE="tools_mingw/qt.tools.${TOOLCHAIN}${VERSION//./}" + REMOTE_BASE="tools_mingw90/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 @@ -356,11 +356,25 @@ for COMPONENT in ${COMPONENTS}; do if [ "${TARGET_PLATFORM}" == "android" ] && [ ! "${VERSION}" \< "6.0.0" ]; then CONF_FILE="${UNPACK_DIR}/${VERSION}/${SUBDIR}/bin/target_qt.conf" + ANDROID_QMAKE_FILE="${UNPACK_DIR}/${VERSION}/${SUBDIR}/bin/qmake" + if [ "${TOOLCHAIN}" == "android_armv7" ] && [ ! "${VERSION}" \< "6.4.2" ]; then + sed -i "s/\r//" "${CONF_FILE}" + sed -i "s|HostLibraryExecutables=.\/bin|HostLibraryExecutables=.\/libexec|g" "${CONF_FILE}" + chmod +x "${ANDROID_QMAKE_FILE}" + sed -i "s|\\\|\/|g" "${ANDROID_QMAKE_FILE}" + fi sed -i "s|target|../$TOOLCHAIN|g" "${CONF_FILE}" sed -i "/HostPrefix/ s|$|gcc_64|g" "${CONF_FILE}" - 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}" + sed -i "s|\/Users\/qt\/work\/install\/bin\/qmake|$QMAKE_FILE|g" "${ANDROID_QMAKE_FILE}" + elif [ "${TARGET_PLATFORM}" == "ios" ] && [ ! "${VERSION}" \< "6.0.0" ]; then + CONF_FILE="${UNPACK_DIR}/${VERSION}/${SUBDIR}/bin/target_qt.conf" + sed -i.bak "s|HostData=target|HostData=../$TOOLCHAIN|g" "${CONF_FILE}" + sed -i.bak "s|HostPrefix=..\/..\/|HostPrefix=..\/..\/macos|g" "${CONF_FILE}" + IOS_QMAKE_FILE="${UNPACK_DIR}/${VERSION}/${SUBDIR}/bin/qmake" + QMAKE_FILE="${UNPACK_DIR}/${VERSION}/macos/bin/qmake" + sed -i.bak "s|\/Users\/qt\/work\/install\/bin\/qmake|${QMAKE_FILE}|g" "${IOS_QMAKE_FILE}" else CONF_FILE="${UNPACK_DIR}/${VERSION}/${SUBDIR}/bin/qt.conf" echo "[Paths]" > ${CONF_FILE} @@ -378,10 +392,14 @@ for COMPONENT in ${COMPONENTS}; do # adjust the PATH variable. echo $(dirname "${CONF_FILE}") elif [[ "${COMPONENT}" =~ "mingw" ]]; then + VERSION_DIR="${VERSION//./}" if [[ "${TOOLCHAIN}" =~ "win64_mingw" ]]; then - echo "${UNPACK_DIR}/Tools/mingw${VERSION//./}_64/bin" + if [[ "${VERSION}" == "9.0.0" ]]; then + VERSION_DIR="1120" + fi + echo "${UNPACK_DIR}/Tools/mingw${VERSION_DIR}_64/bin" elif [[ "${TOOLCHAIN}" =~ "win32_mingw" ]]; then - echo "${UNPACK_DIR}/Tools/mingw${VERSION//./}_32/bin" + echo "${UNPACK_DIR}/Tools/mingw${VERSION_DIR}_32/bin" fi elif [[ "${COMPONENT}" =~ "qtcreator" ]]; then if [ "${HOST_OS}" == "mac_x64" ]; then |