From 9354af237b4ad119109bd1b90a23a5daabe5b836 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Thu, 23 Jan 2020 19:42:13 +1000 Subject: wasm: fix loading of default_pre.prf This fixes windows build and detection of c++ version Task-number: QTBUG-80610 Change-Id: I5196e83f9aad6663aea47c31ae4a2da4c4d74e94 Reviewed-by: Joerg Bornemann --- mkspecs/features/wasm/default_pre.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs/features') diff --git a/mkspecs/features/wasm/default_pre.prf b/mkspecs/features/wasm/default_pre.prf index 2760889929..d092149b32 100644 --- a/mkspecs/features/wasm/default_pre.prf +++ b/mkspecs/features/wasm/default_pre.prf @@ -1,2 +1,2 @@ -load(default_pre) load(emcc_ver) +load(default_pre) -- cgit v1.2.3 From 1635848d87d7720958721e76fdf2f20bfae393ad Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Fri, 31 Jan 2020 08:14:51 +1000 Subject: wasm: remove dependency on perl to find emscripten version Change-Id: I0d5224d497b2b5652d1be036f2a90c6c53f0c9df Fixes: QTBUG-81722 Reviewed-by: Joerg Bornemann --- mkspecs/features/wasm/emcc_ver.prf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mkspecs/features') diff --git a/mkspecs/features/wasm/emcc_ver.prf b/mkspecs/features/wasm/emcc_ver.prf index 505a321d64..411f53e95d 100644 --- a/mkspecs/features/wasm/emcc_ver.prf +++ b/mkspecs/features/wasm/emcc_ver.prf @@ -3,7 +3,9 @@ defineReplace(qtEmccRecommendedVersion) { } defineReplace(qtSystemEmccVersion) { - E_VERSION = $$system("emcc -v 2>&1 | perl -alne $$shell_quote($_ = $F[9]; s/://; print;) ") + EMCC = $$system("emcc -v 2>&1", lines) + EMCC_LINE = $$find(EMCC, "^.*\b(emcc)\b.*$") + E_VERSION = $$section(EMCC_LINE, " ", 9,9) return ($${E_VERSION}) } -- cgit v1.2.3 From 7232c852a6f778fc9b5223c617e3331a2b2716ae Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 14 Feb 2020 17:43:31 +0100 Subject: qmake: Fix handling of QM_FILES_INSTALL_PATH Do not expect the .qm files to be there at qmake time; they will only be generated at build time. Fixes: QTBUG-77398 Change-Id: If73fdb51d40138e52f62eaee0491a5d73d9fe161 Reviewed-by: Joerg Bornemann --- mkspecs/features/lrelease.prf | 1 + 1 file changed, 1 insertion(+) (limited to 'mkspecs/features') diff --git a/mkspecs/features/lrelease.prf b/mkspecs/features/lrelease.prf index 1e828b64df..f611c74184 100644 --- a/mkspecs/features/lrelease.prf +++ b/mkspecs/features/lrelease.prf @@ -35,6 +35,7 @@ embed_translations { !isEmpty(QM_FILES_INSTALL_PATH) { qm_files.files = $$QM_FILES qm_files.path = $$QM_FILES_INSTALL_PATH + qm_files.CONFIG = no_check_exist INSTALLS += qm_files } lrelease.CONFIG += target_predeps no_clean -- cgit v1.2.3