Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: I69238f23882deebeaad46e4fdcf899ab22cc2b8f

1 files changed, 25 insertions, 0 deletions

diff --git a/mkspecs/features/wasm/default_pre.prf b/mkspecs/features/wasm/default_pre.prf
new file mode 100644
index 0000000000..982ef0498f
--- /dev/null
+++ b/mkspecs/features/wasm/default_pre.prf
@@ -0,0 +1,25 @@
+load(default_pre)
+
+defineReplace(qtEmccRecommendedVersion) {
+    return (1.38.27)
+}
+
+defineReplace(qtSystemEmccVersion) {
+    E_VERSION = $$system("emcc -v 2>&1 | perl -alne $$shell_quote($_ = $F[9]; s/://; print;) ")
+    return ($${E_VERSION})
+}
+
+defineTest(qtConfTest_emccVersion) {
+
+    REQ_VERSION = $$qtEmccRecommendedVersion()
+    EMCC_VERSION = $$qtSystemEmccVersion()
+
+    !defined(QT_EMCC_VERSION, var):!equals(EMCC_VERSION, $${REQ_VERSION}) {
+        warning ("You should use the recommended Emscripten version $$REQ_VERSION with this Qt. You have $${EMCC_VERSION} ")
+    }
+    contains(TEMPLATE, .*app) {
+           !equals(QT_EMCC_VERSION, $$EMCC_VERSION)  {
+               warning("This Qt was built with Emscripten version $${QT_EMCC_VERSION}. You have $${EMCC_VERSION}. The difference may cause issues.")
+           }
+    }
+}