Post Merge Fixes

Change-Id: I1e06c01b76b119c3f23b6e6ecbaae8df719b70ce
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 46 insertions, 20 deletions

diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
index f32ff1f8f3..5c287261fb 100644
--- a/src/corelib/.prev_CMakeLists.txt
+++ b/src/corelib/.prev_CMakeLists.txt
@@ -119,9 +119,10 @@ qt_add_module(Core
         plugin/qpluginloader.cpp plugin/qpluginloader.h
         plugin/quuid.cpp plugin/quuid.h
         serialization/qcborarray.h
-        serialization/qcborcommon.h
+        serialization/qcborcommon.cpp serialization/qcborcommon.h serialization/qcborcommon_p.h
         serialization/qcbordiagnostic.cpp
         serialization/qcbormap.h
+        serialization/qcborstream.h
         serialization/qcborvalue.cpp serialization/qcborvalue.h serialization/qcborvalue_p.h
         serialization/qdatastream.cpp serialization/qdatastream.h serialization/qdatastream_p.h
         serialization/qjson_p.h
@@ -193,6 +194,7 @@ qt_add_module(Core
         tools/qcontainertools_impl.h
         tools/qcontiguouscache.cpp tools/qcontiguouscache.h
         tools/qcryptographichash.cpp tools/qcryptographichash.h
+        tools/qflatmap_p.h
         tools/qfreelist.cpp tools/qfreelist_p.h
         tools/qhash.cpp tools/qhash.h
         tools/qhashfunctions.h
@@ -780,6 +782,11 @@ qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_settings AND NOT NACL
         io/qsettings_mac.cpp
 )
 
+qt_extend_target(Core CONDITION QT_FEATURE_settings AND WASM
+    SOURCES
+        io/qsettings_wasm.cpp
+)
+
 qt_extend_target(Core CONDITION QT_FEATURE_filesystemiterator AND WIN32
     SOURCES
         io/qfilesystemiterator_win.cpp
@@ -995,9 +1002,14 @@ qt_extend_target(Core CONDITION QT_FEATURE_textcodec AND WIN32 AND NOT QT_FEATUR
         codecs/qwindowscodec.cpp codecs/qwindowscodec_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_cborstream
+qt_extend_target(Core CONDITION QT_FEATURE_cborstreamreader
     SOURCES
-        serialization/qcborstream.cpp serialization/qcborstream.h
+        serialization/qcborstreamreader.cpp serialization/qcborstreamreader.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_cborstreamwriter
+    SOURCES
+        serialization/qcborstreamwriter.cpp serialization/qcborstreamwriter.h
 )
 
 qt_extend_target(Core CONDITION QT_FEATURE_binaryjson
@@ -1024,24 +1036,38 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype
         mimetypes/qmimetypeparser.cpp mimetypes/qmimetypeparser_p.h
 )
 
-if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database)
-    # Resources:
-    set_source_files_properties("mimetypes/mime/packages/freedesktop.org.xml"
-        PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
-    )
-    set(mimetypes_resource_files
-        "mime/packages/freedesktop.org.xml"
-    )
+#### Keys ignored in scope 197:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype:
+# MIME_DATABASE = "mimetypes/mime/packages/freedesktop.org.xml"
+# OTHER_FILES = "$$MIME_DATABASE"
 
-    qt_add_resource(Core "mimetypes"
-        PREFIX
-            "/qt-project.org/qmime/packages"
-        BASE
-            "mimetypes"
-        FILES
-            ${mimetypes_resource_files}
-    )
-endif()
+qt_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database
+    INCLUDE_DIRECTORIES
+        .rcc
+)
+
+#### Keys ignored in scope 198:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype_database:
+# QMAKE_EXTRA_COMPILERS = "mimedb"
+# mimedb.commands = "${QMAKE_FILE_IN}" ">" "${QMAKE_FILE_OUT}"
+# mimedb.depends = "$$PWD/mime/generate.pl"
+# mimedb.input = "MIME_DATABASE"
+# mimedb.output = "$$outpath/qmimeprovider_database.cpp"
+# mimedb.variable_out = "INCLUDED_SOURCES"
+
+#### Keys ignored in scope 200:.:mimetypes:mimetypes/mimetypes.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# outpath = ".rcc/debug"
+
+#### Keys ignored in scope 201:.:mimetypes:mimetypes/mimetypes.pri:else:
+# outpath = ".rcc/release"
+
+#### Keys ignored in scope 202:.:mimetypes:mimetypes/mimetypes.pri:MAKEFILE_GENERATOR___equals___MSVC.NET OR MAKEFILE_GENERATOR___equals___MSBUILD OR QMAKE_SH_ISEMPTY:
+# mimedb.commands = "cmd" "/c" "$$shell_path($$PWD/mime/generate.bat)"
+# mimedb.depends = "$$PWD/mime/generate.bat" "$$PWD/mime/hexdump.ps1"
+
+#### Keys ignored in scope 203:.:mimetypes:mimetypes/mimetypes.pri:else:
+# mimedb.commands = "perl" "$${mimedb.depends}"
+
+#### Keys ignored in scope 204:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd:
+# mimedb.commands = "--zstd"
 
 qt_extend_target(Core CONDITION WASM
     SOURCES