qt 6.6.0 clean

mkspecs/common/wasm/wasm.conf

@@ -36,7 +36,8 @@ EMCC_COMMON_LFLAGS += \
     -s FETCH=1 \
     -s MODULARIZE=1 \
     -s EXPORT_NAME=createQtAppInstance \
-    -s WASM_BIGINT=1
+    -s WASM_BIGINT=1 \
+    -s STACK_SIZE=5MB
 
 # The -s arguments can also be used with release builds,
 # but are here in debug for clarity.

mkspecs/devices/integrity-armv8-SA8155P/qmake.conf

@@ -6,7 +6,7 @@ load(device_config)
 
 include(../../common/ghs-integrity-armv8.conf)
 
-QMAKE_CFLAGS             = --signed_fields --no_commons --diag_suppress=1,82,228,236,381,611,961,997,1795,1931,1974,3148 --defer_parse_function_templates --exceptions
+QMAKE_CFLAGS             = --signed_fields --no_commons --diag_suppress=1,82,228,236,381,611,961,997,1795,1931,1974,3148,1721,1424,193,940,620,111,128,185,826,186,68,830,177,554,550,175,1441,546 --defer_parse_function_templates --exceptions
 QMAKE_CXXFLAGS           = $$QMAKE_CFLAGS --no_implicit_include --link_once_templates -non_shared --new_outside_of_constructor --c++17
 QMAKE_LFLAGS            += --thread_local_storage --exceptions
 

mkspecs/features/mac/default_post.prf

@@ -50,29 +50,6 @@ contains(TEMPLATE, .*app) {
 
 !no_objective_c:CONFIG += objective_c
 
-qt {
-    qtConfig(static) {
-        # C++11 support means using libc++ instead of libstd++. As the
-        # two libraries are incompatible we need to ensure the end user
-        # project is built using the same C++11 support/no support as Qt.
-        qtConfig(c++11) {
-            CONFIG += c++11
-        } else: c++11 {
-            warning("Qt was not built with C++11 enabled, disabling feature")
-            CONFIG -= c++11
-        }
-
-        !c++11 {
-            # Explicitly use libstdc++ if C++11 support is not enabled,
-            # as otherwise the compiler will choose the standard library
-            # based on the deployment target, which for iOS 7 and OS X 10.9
-            # is libc++, and we can't mix and match the two.
-            QMAKE_CXXFLAGS += -stdlib=libstdc++
-            QMAKE_LFLAGS   += -stdlib=libstdc++
-        }
-    }
-}
-
 # Add the same default rpaths as Xcode does for new projects.
 # This is especially important for iOS/tvOS/watchOS where no other option is possible.
 !no_default_rpath {

mkspecs/features/qt.prf

@@ -2,6 +2,9 @@
 # due to required Qt modules being missing.
 !isEmpty(QMAKE_FAILED_REQUIREMENTS): return()
 
+# hardcoded defaults
+QT_CONFIG *= c99 c11 c++11 c++14 c++1z c++17
+
 qtConfig(thread): CONFIG *= thread
 
 #handle defines

mkspecs/features/wasm/emcc_ver.prf

@@ -1,5 +1,5 @@
 defineReplace(qtEmccRecommendedVersion) {
-    return (3.1.25)
+    return (3.1.37)
 }
 
 defineReplace(qtSystemEmccVersion) {

mkspecs/features/wasm/wasm.prf

@@ -9,9 +9,9 @@ exists($$QMAKE_QT_CONFIG) {
 
     ## qmake puts a space if done otherwise
     !isEmpty(QT_WASM_EXTRA_EXPORTED_METHODS): {
-        EXPORTED_METHODS = UTF16ToString,stringToUTF16,JSEvents,specialHTMLTargets,$$QT_WASM_EXTRA_EXPORTED_METHODS
+        EXPORTED_METHODS = UTF16ToString,stringToUTF16,JSEvents,specialHTMLTargets,FS,$$QT_WASM_EXTRA_EXPORTED_METHODS
     } else {
-        EXPORTED_METHODS = UTF16ToString,stringToUTF16,JSEvents,specialHTMLTargets
+        EXPORTED_METHODS = UTF16ToString,stringToUTF16,JSEvents,specialHTMLTargets,FS
     }
     EMCC_LFLAGS += -s EXPORTED_RUNTIME_METHODS=$$EXPORTED_METHODS
 
@@ -47,6 +47,17 @@ exists($$QMAKE_QT_CONFIG) {
         QMAKE_LFLAGS_DEBUG += -msimd128 -msse -msse2
     }
 
+    qtConfig(shared) {
+        contains(TEMPLATE, .*app) {
+            EMCC_MODULE_FLAGS = -s MAIN_MODULE=1
+        }
+        contains(TEMPLATE, .*lib):!static: {
+            EMCC_MODULE_FLAGS = -s SIDE_MODULE=1
+        }
+        EMCC_CFLAGS += $$EMCC_MODULE_FLAGS
+        EMCC_LFLAGS += $$EMCC_MODULE_FLAGS
+    }
+
     QMAKE_LFLAGS       += $$EMCC_LFLAGS
     QMAKE_LFLAGS_DEBUG += $$EMCC_LFLAGS
     QMAKE_CFLAGS += $$EMCC_CFLAGS
@@ -81,11 +92,16 @@ contains(TEMPLATE, .*app) {
         WASM_PLUGIN_PATH = $$PWD/../../../src/plugins/platforms/wasm
     }
 
+    PRELOAD = ""
+    shared {
+        PRELOAD = "preload:\ ['qt_plugins.json',\ 'qt_qml_imports.json'],"
+    }
+
     # Copy/Generate main .html file (e.g. myapp.html) from the webassembly_shell.html by
     # replacing the app name placeholder with the actual app name.
     apphtml.name = application main html file
     apphtml.output = $$DESTDIR/$$TARGET_HTML
-    apphtml.commands = $$QMAKE_STREAM_EDITOR -e s/@APPNAME@/$$TARGET_BASE/g $$WASM_PLUGIN_PATH/wasm_shell.html > $$DESTDIR/$$TARGET_HTML
+    apphtml.commands = $$QMAKE_STREAM_EDITOR -e s/@APPNAME@/$$TARGET_BASE/g -e s/@PRELOAD@/$$PRELOAD/g $$WASM_PLUGIN_PATH/wasm_shell.html > $$DESTDIR/$$TARGET_HTML
     apphtml.input = $$WASM_PLUGIN_PATH/wasm_shell.html
     apphtml.depends = $$apphtml.input
     QMAKE_EXTRA_COMPILERS += apphtml