diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2023-05-03 12:21:53 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-05-03 12:21:53 +0200 |
| commit | cdc4d8a0c694598fd4aa6ab484f562d99a094870 (patch) | |
| tree | d1703a9fcc195366ebba1a469cce43fb4d400897 /scripts | |
| parent | 1f5f46e572cf7ffcd2ae4e90024349928719ba35 (diff) | |
| parent | 03e717b06ed5c0864618e763f08f91d9fc94b733 (diff) | |
Merge 2.0 into master
Change-Id: I521dd5baab4b4374f9221a163ba8e83531edf8bb
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install-qt.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/install-qt.sh b/scripts/install-qt.sh index 717bab6af..0931693e5 100755 --- a/scripts/install-qt.sh +++ b/scripts/install-qt.sh @@ -367,6 +367,13 @@ for COMPONENT in ${COMPONENTS}; do 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} |