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

 Conflicts:
	src/corelib/codecs/qicucodec.cpp
	src/dbus/qdbusserver.cpp
	src/gui/painting/qbezier.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
	src/plugins/printsupport/cups/qppdprintdevice.cpp

Change-Id: I2703128bb64baf5580fbc2c2061b55b0f0611d2a

3 files changed, 20 insertions, 12 deletions

diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
index 60b2eb2117..26bd3e2e98 100644
--- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf
@@ -270,7 +270,7 @@ xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identif
 QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting
 
 !macx-xcode {
-    generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode $(EXPORT__PRO_FILE_) $$QMAKE_ARGS
+    generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS
     generate_xcode_project.target = xcodeproj
     QMAKE_EXTRA_VARIABLES += _PRO_FILE_
     QMAKE_EXTRA_TARGETS += generate_xcode_project
diff --git a/mkspecs/features/uikit/gc_binaries.prf b/mkspecs/features/uikit/gc_binaries.prf
index c4f7445951..aa27e69054 100644
--- a/mkspecs/features/uikit/gc_binaries.prf
+++ b/mkspecs/features/uikit/gc_binaries.prf
@@ -1,2 +1,6 @@
 # bitcode (release mode) is incompatible with splitting sections.
-!bitcode|!release: load(gc_binaries)
+# We have to explicitly exclude Xcode, as that supports both debug
+# and release builds in the same project. Xcode already has a settting
+# for dead code stripping which is enabled by default, so we'll still
+# strip any libraries build with split sections.
+!bitcode|if(!macx-xcode:!release): load(gc_binaries)
diff --git a/mkspecs/features/wasm/wasm.prf b/mkspecs/features/wasm/wasm.prf
index 54d351bfd5..25413d7470 100644
--- a/mkspecs/features/wasm/wasm.prf
+++ b/mkspecs/features/wasm/wasm.prf
@@ -6,16 +6,6 @@ exists($$QMAKE_QT_CONFIG) {
     qtConfig(thread) {
 
         EMCC_THREAD_LFLAGS += -s USE_PTHREADS=1
-        # Hardcode wasm memory size. Emscripten does not currently support memory growth
-        # (ALLOW_MEMORY_GROWTH) in pthreads mode, and requires specifying the memory size
-        # at build time. Further, browsers limit the maximum initial memory size to 1GB.
-        TOTAL_MEMORY = 1GB
-        !isEmpty(QMAKE_WASM_TOTAL_MEMORY) {
-            TOTAL_MEMORY = $$QMAKE_WASM_TOTAL_MEMORY
-        }
-
-        message("Setting TOTAL_MEMORY to" $$TOTAL_MEMORY)
-        EMCC_THREAD_LFLAGS += -s TOTAL_MEMORY=$$TOTAL_MEMORY
 
         # Create worker threads at startup. This is supposed to be an optimization,
         # however exceeding the pool size has been obesverved to hang the application.
@@ -29,6 +19,20 @@ exists($$QMAKE_QT_CONFIG) {
     } else {
         EMCC_THREAD_LFLAGS += -s ALLOW_MEMORY_GROWTH=1
     }
+
+     qtConfig(thread) | !isEmpty(QMAKE_WASM_TOTAL_MEMORY) {
+
+            # Hardcode wasm memory size. Emscripten does not currently support memory growth
+            # (ALLOW_MEMORY_GROWTH) in pthreads mode, and requires specifying the memory size
+            # at build time. Further, browsers limit the maximum initial memory size to 1GB.
+            # QMAKE_WASM_TOTAL_MEMORY must be a multiple of 64KB
+            TOTAL_MEMORY = 1GB
+            !isEmpty(QMAKE_WASM_TOTAL_MEMORY) {
+                TOTAL_MEMORY = $$QMAKE_WASM_TOTAL_MEMORY
+            }
+            message("Setting TOTAL_MEMORY to" $$TOTAL_MEMORY)
+            EMCC_THREAD_LFLAGS += -s TOTAL_MEMORY=$$TOTAL_MEMORY
+    }
     QMAKE_LFLAGS       += $$EMCC_THREAD_LFLAGS
     QMAKE_LFLAGS_DEBUG += $$EMCC_THREAD_LFLAGS
     QMAKE_CFLAGS += $$EMCC_THREAD_LFLAGS