diff options
author | Richard Weickelt <richard@weickelt.de> | 2019-08-15 07:22:02 +0200 |
---|---|---|
committer | Richard Weickelt <richard@weickelt.de> | 2019-08-23 13:09:43 +0000 |
commit | 0d52ce22a9bf1d19a4c5590dd17f7f80abb3b6aa (patch) | |
tree | 26ccee167aacdcc3757f3b0869bf0d16f0f0c423 /scripts/install-qt.sh | |
parent | 45875ba07926bfb5b60b4604bb9b39dc3abdd474 (diff) |
Switch to Qt installer script in Docker container
Use the official packages instead of compiling Qt ourselves.
This simplifies the Docker image a lot. For accessing the
script folder, the Docker context needs to change to the
root directory. Thus, we need a .dockerignore file to keep
the size of the context low.
Change-Id: I58ec8f364feba955518f1eaf5bff234332ae8dec
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'scripts/install-qt.sh')
-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 c2793b3ce..c395cb6a7 100755 --- a/scripts/install-qt.sh +++ b/scripts/install-qt.sh @@ -288,6 +288,13 @@ for COMPONENT in ${COMPONENTS}; do echo "[Paths]" > ${CONF_FILE} echo "Prefix = .." >> ${CONF_FILE} + # 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" + sed -i.bak 's/Enterprise/OpenSource/g' "${PRI_FILE}" + sed -i.bak 's/licheck.*//g' "${PRI_FILE}" + rm "${PRI_FILE}.bak" + # Print the directory so that the caller can # adjust the PATH variable. echo $(dirname "${CONF_FILE}") |