diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-02-18 09:26:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-02-18 09:26:53 +0100 |
| commit | b9585277e78f0571933706507ba2024c68d6df19 (patch) | |
| tree | c98577aae762b75d0ac6437c1ec68da0ddb4426b /mkspecs | |
| parent | eb2af9d923923255b276c6549ada1ed7839d5dd8 (diff) | |
| parent | d7b6c4288f2de8b0123c888e83a3fbcd84ed906f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/corelib/tools/qlinkedlist.h
src/plugins/platforms/wasm/qwasmintegration.cpp
src/plugins/platforms/wasm/qwasmscreen.cpp
Change-Id: Iefca7f9f4966bdc20e7052aca736874861055738
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/wasm/emcc_ver.prf | 4 |
1 files changed, 3 insertions, 1 deletions
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}) } |