Re-generate affected cmake files and configure.json after the merge

This also removes the workarounds of commit
b2662b05dd078c46b82f5f041f51b0b83554113d now that it's fixed "upstream"
in the .pro files.

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

3 files changed, 39 insertions, 21 deletions

diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
index 70a8a5c8a3..dd11847011 100644
--- a/src/corelib/.prev_CMakeLists.txt
+++ b/src/corelib/.prev_CMakeLists.txt
@@ -121,7 +121,6 @@ add_qt_module(Core
         serialization/qcborcommon.h
         serialization/qcbordiagnostic.cpp
         serialization/qcbormap.h
-        serialization/qcborstream.cpp 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.cpp serialization/qjson_p.h
@@ -364,6 +363,7 @@ extend_target(Core CONDITION WIN32 AND NOT WINRT
         io/qwindowspipereader.cpp io/qwindowspipereader_p.h
         io/qwindowspipewriter.cpp io/qwindowspipewriter_p.h
         kernel/qeventdispatcher_win.cpp kernel/qeventdispatcher_win_p.h
+        kernel/qwinregistry.cpp kernel/qwinregistry_p.h
     LIBRARIES
         advapi32
         kernel32
@@ -995,6 +995,11 @@ extend_target(Core CONDITION QT_FEATURE_textcodec AND WIN32 AND NOT QT_FEATURE_i
         codecs/qwindowscodec.cpp codecs/qwindowscodec_p.h
 )
 
+extend_target(Core CONDITION QT_FEATURE_cborstream
+    SOURCES
+        serialization/qcborstream.cpp serialization/qcborstream.h
+)
+
 extend_target(Core CONDITION QT_FEATURE_qeventtransition
     SOURCES
         statemachine/qeventtransition.cpp statemachine/qeventtransition.h statemachine/qeventtransition_p.h
@@ -1011,23 +1016,24 @@ extend_target(Core CONDITION QT_FEATURE_mimetype
         mimetypes/qmimetypeparser.cpp mimetypes/qmimetypeparser_p.h
 )
 
-# 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"
-)
-
-add_qt_resource(Core "mimetypes"
-    PREFIX
-        "/qt-project.org/qmime/packages"
-    BASE
-        "mimetypes"
-    FILES
-        ${mimetypes_resource_files}
-)
-
+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"
+    )
+    
+    add_qt_resource(Core "mimetypes"
+        PREFIX
+            "/qt-project.org/qmime/packages"
+        BASE
+            "mimetypes"
+        FILES
+            ${mimetypes_resource_files}
+    )
+endif()
 
 extend_target(Core CONDITION WASM
     SOURCES
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 48afa3c502..82e05c690d 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -135,7 +135,6 @@ add_qt_module(Core
         serialization/qcborcommon.h
         serialization/qcbordiagnostic.cpp
         serialization/qcbormap.h
-        serialization/qcborstream.cpp 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.cpp serialization/qjson_p.h
@@ -447,6 +446,7 @@ extend_target(Core CONDITION WIN32 AND NOT WINRT
         io/qwindowspipereader.cpp io/qwindowspipereader_p.h
         io/qwindowspipewriter.cpp io/qwindowspipewriter_p.h
         kernel/qeventdispatcher_win.cpp kernel/qeventdispatcher_win_p.h
+        kernel/qwinregistry.cpp kernel/qwinregistry_p.h
     LIBRARIES
         advapi32
         kernel32
@@ -1071,6 +1071,11 @@ extend_target(Core CONDITION QT_FEATURE_textcodec AND WIN32 AND NOT QT_FEATURE_i
         codecs/qwindowscodec.cpp codecs/qwindowscodec_p.h
 )
 
+extend_target(Core CONDITION QT_FEATURE_cborstream
+    SOURCES
+        serialization/qcborstream.cpp serialization/qcborstream.h
+)
+
 extend_target(Core CONDITION QT_FEATURE_qeventtransition
     SOURCES
         statemachine/qeventtransition.cpp statemachine/qeventtransition.h statemachine/qeventtransition_p.h
@@ -1092,8 +1097,10 @@ extend_target(Core CONDITION QT_FEATURE_mimetype
 # We can't specify the resources directly as we have unit tests that
 # depend on these as well and we no longer support the use of hand
 # edited qrc files.
-include(${CMAKE_CURRENT_SOURCE_DIR}/mimetypes/mimetypes_resources.cmake)
-corelib_add_mimetypes_resources(Core)
+if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database)
+    include(${CMAKE_CURRENT_SOURCE_DIR}/mimetypes/mimetypes_resources.cmake)
+    corelib_add_mimetypes_resources(Core)
+endif()
 # special case end
 
 extend_target(Core CONDITION WASM
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake
index 6ca29a8fc9..9730f78962 100644
--- a/src/corelib/configure.cmake
+++ b/src/corelib/configure.cmake
@@ -906,3 +906,8 @@ qt_feature("win32_system_libs"
     LABEL "Windows System Libraries"
     CONDITION WIN32 AND libs.advapi32 AND libs.gdi32 AND libs.kernel32 AND libs.netapi32 AND libs.ole32 AND libs.shell32 AND libs.uuid AND libs.user32 AND libs.winmm AND libs.ws2_32 OR FIXME
 )
+qt_feature("cborstream" PUBLIC
+    SECTION "Utilities"
+    LABEL "CBOR stream I/O"
+    PURPOSE "Provides support for reading and writing the CBOR binary format.  Note that this is required for plugin loading. Qt GUI needs QPA plugins for basic operation."
+)