Regenerate files after dev -> wip/cmake merge

Note the following bigger things that had to be done:
Handle GSS library / feature with a new custom find module.
Implement rudimentary support for relocatability (does not currently
handle extprefix).

Change-Id: Ic6cd27dda7ebca9829f51cb42ea76fff6d1767ef
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

17 files changed, 72 insertions, 72 deletions

diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
index 7cab049b62..70a8a5c8a3 100644
--- a/src/corelib/.prev_CMakeLists.txt
+++ b/src/corelib/.prev_CMakeLists.txt
@@ -173,7 +173,7 @@ add_qt_module(Core
         thread/qrunnable.cpp thread/qrunnable.h
         thread/qthread.cpp thread/qthread.h
         thread/qthreadstorage.h
-        thread/qwaitcondition.h
+        thread/qwaitcondition.h thread/qwaitcondition_p.h
         time/qcalendar.cpp time/qcalendar.h
         time/qcalendarbackend_p.h
         time/qcalendarmath_p.h
@@ -257,7 +257,7 @@ if(ANDROID)
         jar/QtAndroid.jar
     )
     set_property(TARGET Core APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES
-        plugins/platforms/android/libqtforandroid.so
+        plugins/platforms/libplugins_platforms_qtforandroid.so
     )
     set_property(TARGET Core APPEND PROPERTY QT_ANDROID_PERMISSIONS
         android.permission.INTERNET android.permission.WRITE_EXTERNAL_STORAGE
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 5be57fab8f..48afa3c502 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -187,7 +187,7 @@ add_qt_module(Core
         thread/qrunnable.cpp thread/qrunnable.h
         thread/qthread.cpp thread/qthread.h
         thread/qthreadstorage.h
-        thread/qwaitcondition.h
+        thread/qwaitcondition.h thread/qwaitcondition_p.h
         time/qcalendar.cpp time/qcalendar.h
         time/qcalendarbackend_p.h
         time/qcalendarmath_p.h
@@ -341,7 +341,7 @@ if(ANDROID)
         jar/QtAndroid.jar
     )
     set_property(TARGET Core APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES
-        plugins/platforms/android/libqtforandroid.so
+        plugins/platforms/libplugins_platforms_qtforandroid.so
     )
     set_property(TARGET Core APPEND PROPERTY QT_ANDROID_PERMISSIONS
         android.permission.INTERNET android.permission.WRITE_EXTERNAL_STORAGE
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake
index 631958b2d7..6ca29a8fc9 100644
--- a/src/corelib/configure.cmake
+++ b/src/corelib/configure.cmake
@@ -488,10 +488,6 @@ qt_feature("clock_monotonic" PUBLIC
     CONDITION QT_FEATURE_clock_gettime AND TEST_clock_monotonic
 )
 qt_feature_definition("clock_monotonic" "QT_NO_CLOCK_MONOTONIC" NEGATE VALUE "1")
-qt_feature("dlopen" PRIVATE
-    LABEL "dlopen()"
-    CONDITION UNIX
-)
 qt_feature("cxx11_future" PUBLIC
     LABEL "C++11 <future>"
     CONDITION TEST_cxx11_future
@@ -699,7 +695,7 @@ qt_feature_definition("textdate" "QT_NO_TEXTDATE" NEGATE VALUE "1")
 qt_feature("datestring" PUBLIC
     SECTION "Data structures"
     LABEL "QDate/QTime/QDateTime"
-    PURPOSE "Provides convertion between dates and strings."
+    PURPOSE "Provides conversion between dates and strings."
     CONDITION QT_FEATURE_textdate
 )
 qt_feature_definition("datestring" "QT_NO_DATESTRING" NEGATE VALUE "1")
diff --git a/src/corelib/global/qconfig.cpp.in b/src/corelib/global/qconfig.cpp.in
index 7a5eeb0b04..7fa21bcfed 100644
--- a/src/corelib/global/qconfig.cpp.in
+++ b/src/corelib/global/qconfig.cpp.in
@@ -18,7 +18,10 @@ static const char qt_configure_strs[] =
 @QT_CONFIG_STRS_SECOND@
 #endif
 ;
-#define QT_CONFIGURE_SETTINGS_PATH "etc/xdg"
+#define QT_CONFIGURE_SETTINGS_PATH "@QT_DEFAULT_SYS_CONF_DIR@"
+#define QT_CONFIGURE_LIBLOCATION_TO_PREFIX_PATH "@QT_CONFIGURE_LIBLOCATION_TO_PREFIX_PATH@"
+#define QT_CONFIGURE_HOSTBINDIR_TO_EXTPREFIX_PATH "@QT_CONFIGURE_HOSTBINDIR_TO_EXTPREFIX_PATH@"
+#define QT_CONFIGURE_HOSTBINDIR_TO_HOSTPREFIX_PATH "@QT_CONFIGURE_HOSTBINDIR_TO_HOSTPREFIX_PATH@"
 #ifdef QT_BUILD_QMAKE
 # define QT_CONFIGURE_SYSROOTIFY_PREFIX false
 #endif
diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt
index 4b7cf9d434..16e25bd8e8 100644
--- a/src/network/.prev_CMakeLists.txt
+++ b/src/network/.prev_CMakeLists.txt
@@ -82,7 +82,7 @@ if(ANDROID AND (QT_FEATURE_bearermanagement))
         jar/QtAndroidBearer.jar
     )
     set_property(TARGET Network APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES
-        plugins/bearer/libqandroidbearer.so
+        plugins/bearer/libplugins_bearer_qandroidbearer.so
     )
     set_property(TARGET Network APPEND PROPERTY QT_ANDROID_PERMISSIONS
         android.permission.ACCESS_NETWORK_STATE
@@ -141,11 +141,6 @@ extend_target(Network CONDITION QT_FEATURE_http
         socket/qhttpsocketengine.cpp socket/qhttpsocketengine_p.h
 )
 
-extend_target(Network CONDITION QT_FEATURE_http AND QT_FEATURE_ssl
-    SOURCES
-        access/qspdyprotocolhandler.cpp access/qspdyprotocolhandler_p.h
-)
-
 extend_target(Network CONDITION QT_FEATURE_dnslookup
     SOURCES
         kernel/qdnslookup.cpp kernel/qdnslookup.h kernel/qdnslookup_p.h
@@ -235,7 +230,7 @@ extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_OSX AND NOT QT_FEATU
 
 extend_target(Network CONDITION QT_FEATURE_gssapi
     LIBRARIES
-        gssapi_krb5
+        GSSAPI::GSSAPI
 )
 
 extend_target(Network CONDITION APPLE_UIKIT
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index df2fb82168..0715f49499 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -82,7 +82,7 @@ if(ANDROID AND (QT_FEATURE_bearermanagement))
         jar/QtAndroidBearer.jar
     )
     set_property(TARGET Network APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES
-        plugins/bearer/libqandroidbearer.so
+        plugins/bearer/libplugins_bearer_qandroidbearer.so
     )
     set_property(TARGET Network APPEND PROPERTY QT_ANDROID_PERMISSIONS
         android.permission.ACCESS_NETWORK_STATE
@@ -141,11 +141,6 @@ extend_target(Network CONDITION QT_FEATURE_http
         socket/qhttpsocketengine.cpp socket/qhttpsocketengine_p.h
 )
 
-extend_target(Network CONDITION QT_FEATURE_http AND QT_FEATURE_ssl
-    SOURCES
-        access/qspdyprotocolhandler.cpp access/qspdyprotocolhandler_p.h
-)
-
 extend_target(Network CONDITION QT_FEATURE_dnslookup
     SOURCES
         kernel/qdnslookup.cpp kernel/qdnslookup.h kernel/qdnslookup_p.h
@@ -237,7 +232,7 @@ extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_OSX AND NOT QT_FEATU
 
 extend_target(Network CONDITION QT_FEATURE_gssapi
     LIBRARIES
-        gssapi_krb5
+        GSSAPI::GSSAPI
 )
 
 extend_target(Network CONDITION APPLE_UIKIT
diff --git a/src/network/configure.cmake b/src/network/configure.cmake
index 2dd5460b9d..1e2df486f4 100644
--- a/src/network/configure.cmake
+++ b/src/network/configure.cmake
@@ -9,6 +9,7 @@
 qt_find_package(Libproxy PROVIDED_TARGETS PkgConfig::Libproxy)
 qt_find_package(OpenSSL PROVIDED_TARGETS OpenSSL::SSL)
 qt_find_package(OpenSSL PROVIDED_TARGETS OpenSSL::SSL)
+qt_find_package(GSSAPI PROVIDED_TARGETS GSSAPI::GSSAPI)
 
 
 #### Tests
@@ -165,23 +166,6 @@ int main(int argc, char **argv)
 "# FIXME: use: openssl
 )
 
-# gssapi
-qt_config_compile_test(gssapi
-    LABEL "KRB5 GSSAPI support"
-"
-#include <gssapi/gssapi.h>
-
-int main(int argc, char **argv)
-{
-    (void)argc; (void)argv;
-    /* BEGIN TEST: */
-gss_ctx_id_t ctx;
-    /* END TEST: */
-    return 0;
-}
-"# FIXME: qmake: LIBS += -lgssapi_krb5
-)
-
 # netlistmgr
 qt_config_compile_test(netlistmgr
     LABEL "Network List Manager"
@@ -349,6 +333,7 @@ qt_feature("bearermanagement" PUBLIC
     CONDITION QT_FEATURE_thread AND QT_FEATURE_library AND QT_FEATURE_networkinterface AND QT_FEATURE_properties
 )
 qt_feature_definition("bearermanagement" "QT_NO_BEARERMANAGEMENT" NEGATE VALUE "1")
+qt_feature_definition("bearermanagement" "QT_NO_BEARERMANAGEMENT" NEGATE)
 qt_feature("localserver" PUBLIC
     SECTION "Networking"
     LABEL "QLocalServer"
@@ -365,7 +350,7 @@ qt_feature("gssapi" PUBLIC
     SECTION "Networking"
     LABEL "GSSAPI"
     PURPOSE "Enable SPNEGO authentication through GSSAPI"
-    CONDITION NOT WIN32 AND TEST_gssapi
+    CONDITION NOT WIN32 AND GSSAPI_FOUND
 )
 qt_feature_definition("gssapi" "QT_NO_GSSAPI" NEGATE VALUE "1")
 qt_feature("sspi" PUBLIC
diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt
index 214576b6df..bc11188e14 100644
--- a/src/plugins/platforms/android/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/android/.prev_CMakeLists.txt
@@ -6,7 +6,7 @@
 
 add_qt_plugin(qtforandroid
     TYPE platforms
-    OUTPUT_DIRECTORY "$$DESTDIR/android"
+    CLASS_NAME QAndroidIntegrationPlugin
     SOURCES
         androidcontentfileengine.cpp androidcontentfileengine.h
         androiddeadlockprotector.cpp androiddeadlockprotector.h
@@ -17,6 +17,7 @@ add_qt_plugin(qtforandroid
         androidjnimenu.cpp androidjnimenu.h
         androidplatformplugin.cpp
         androidsurfaceclient.h
+        main.cpp
         qandroidassetsfileenginehandler.cpp qandroidassetsfileenginehandler.h
         qandroideventdispatcher.cpp qandroideventdispatcher.h
         qandroidinputcontext.cpp qandroidinputcontext.h
@@ -39,8 +40,6 @@ add_qt_plugin(qtforandroid
         qandroidplatformtheme.cpp qandroidplatformtheme.h
         qandroidplatformwindow.cpp qandroidplatformwindow.h
         qandroidsystemlocale.cpp qandroidsystemlocale.h
-    DEFINES
-        QT_STATICPLUGIN
     INCLUDE_DIRECTORIES
         ${CMAKE_CURRENT_SOURCE_DIR}
         ${QT_SOURCE_TREE}/src/3rdparty/android
@@ -65,7 +64,6 @@ add_qt_plugin(qtforandroid
 #### Keys ignored in scope 1:.:.:android.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/android.json"
 # _LOADED = "qt_plugin"
-# target.path = "$${target.path}/android"
 
 ## Scopes:
 #####################################################################
diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt
index f8d23e8371..331ec21fe5 100644
--- a/src/plugins/platforms/android/CMakeLists.txt
+++ b/src/plugins/platforms/android/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 add_qt_plugin(qtforandroid
     TYPE platforms
-    # OUTPUT_DIRECTORY "$$DESTDIR/android" # special case remove
+    CLASS_NAME QAndroidIntegrationPlugin
     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES android # special case
     SOURCES
         androidcontentfileengine.cpp androidcontentfileengine.h
@@ -18,6 +18,7 @@ add_qt_plugin(qtforandroid
         androidjnimenu.cpp androidjnimenu.h
         androidplatformplugin.cpp
         androidsurfaceclient.h
+        main.cpp
         qandroidassetsfileenginehandler.cpp qandroidassetsfileenginehandler.h
         qandroideventdispatcher.cpp qandroideventdispatcher.h
         qandroidinputcontext.cpp qandroidinputcontext.h
@@ -40,8 +41,6 @@ add_qt_plugin(qtforandroid
         qandroidplatformtheme.cpp qandroidplatformtheme.h
         qandroidplatformwindow.cpp qandroidplatformwindow.h
         qandroidsystemlocale.cpp qandroidsystemlocale.h
-    DEFINES
-        QT_STATICPLUGIN
     INCLUDE_DIRECTORIES
         ${CMAKE_CURRENT_SOURCE_DIR}
         ${QT_SOURCE_TREE}/src/3rdparty/android
@@ -74,7 +73,6 @@ add_qt_plugin(qtforandroid
 #### Keys ignored in scope 1:.:.:android.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/android.json"
 # _LOADED = "qt_plugin"
-# target.path = "$${target.path}/android"
 
 ## Scopes:
 #####################################################################
diff --git a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
index 9e79fc3a5c..8808017a87 100644
--- a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
@@ -10,8 +10,6 @@ add_qt_plugin(qcocoa
     SOURCES
         main.mm
         messages.cpp messages.h
-        qcocoaaccessibility.h qcocoaaccessibility.mm
-        qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm
         qcocoaapplication.h qcocoaapplication.mm
         qcocoaapplicationdelegate.h qcocoaapplicationdelegate.mm
         qcocoabackingstore.h qcocoabackingstore.mm
@@ -45,7 +43,6 @@ add_qt_plugin(qcocoa
         qnswindow.h qnswindow.mm
         qnswindowdelegate.h qnswindowdelegate.mm
     LIBRARIES
-        Qt::AccessibilitySupportPrivate
         Qt::ClipboardSupportPrivate
         Qt::CorePrivate
         Qt::FontDatabaseSupportPrivate
@@ -62,7 +59,6 @@ add_qt_plugin(qcocoa
         ${FWMetal}
         ${FWQuartzCore}
         Cups::Cups
-        Qt::AccessibilitySupport
         Qt::ClipboardSupport
         Qt::Core
         Qt::FontDatabaseSupport
@@ -107,23 +103,39 @@ extend_target(qcocoa CONDITION QT_FEATURE_vulkan
         Qt::VulkanSupport
 )
 
+extend_target(qcocoa CONDITION QT_FEATURE_accessibility
+    SOURCES
+        qcocoaaccessibility.h qcocoaaccessibility.mm
+        qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm
+    LIBRARIES
+        Qt::AccessibilitySupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::AccessibilitySupport
+)
+
 extend_target(qcocoa CONDITION TARGET Qt::Widgets
     SOURCES
-        qcocoaprintdevice.h qcocoaprintdevice.mm
-        qcocoaprintersupport.h qcocoaprintersupport.mm
         qpaintengine_mac.mm qpaintengine_mac_p.h
-        qprintengine_mac.mm qprintengine_mac_p.h
     LIBRARIES
-        Qt::PrintSupportPrivate
         Qt::WidgetsPrivate
     PUBLIC_LIBRARIES
-        Qt::PrintSupport
         Qt::Widgets
 )
 
-#### Keys ignored in scope 5:.:.:cocoa.pro:TARGET Qt::Widgets:
+#### Keys ignored in scope 6:.:.:cocoa.pro:TARGET Qt::Widgets:
 # QT_FOR_CONFIG = "widgets"
 
+extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets
+    SOURCES
+        qcocoaprintdevice.h qcocoaprintdevice.mm
+        qcocoaprintersupport.h qcocoaprintersupport.mm
+        qprintengine_mac.mm qprintengine_mac_p.h
+    LIBRARIES
+        Qt::PrintSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::PrintSupport
+)
+
 extend_target(qcocoa CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets
     SOURCES
         qcocoacolordialoghelper.h qcocoacolordialoghelper.mm
@@ -139,5 +151,5 @@ extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets
         qcocoafontdialoghelper.h qcocoafontdialoghelper.mm
 )
 
-#### Keys ignored in scope 9:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 11:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt
index c756db6b5a..53b56da5f1 100644
--- a/src/plugins/platforms/cocoa/CMakeLists.txt
+++ b/src/plugins/platforms/cocoa/CMakeLists.txt
@@ -14,8 +14,6 @@ add_qt_plugin(qcocoa
     SOURCES
         main.mm
         messages.cpp messages.h
-        qcocoaaccessibility.h qcocoaaccessibility.mm
-        qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm
         qcocoaapplication.h qcocoaapplication.mm
         qcocoaapplicationdelegate.h qcocoaapplicationdelegate.mm
         qcocoabackingstore.h qcocoabackingstore.mm
@@ -49,7 +47,6 @@ add_qt_plugin(qcocoa
         qnswindow.h qnswindow.mm
         qnswindowdelegate.h qnswindowdelegate.mm
     LIBRARIES
-        Qt::AccessibilitySupportPrivate
         Qt::ClipboardSupportPrivate
         Qt::CorePrivate
         Qt::FontDatabaseSupportPrivate
@@ -66,7 +63,6 @@ add_qt_plugin(qcocoa
         ${FWMetal}
         ${FWQuartzCore}
         Cups::Cups
-        Qt::AccessibilitySupport
         Qt::ClipboardSupport
         Qt::Core
         Qt::FontDatabaseSupport
@@ -111,23 +107,39 @@ extend_target(qcocoa CONDITION QT_FEATURE_vulkan
         Qt::VulkanSupport
 )
 
+extend_target(qcocoa CONDITION QT_FEATURE_accessibility
+    SOURCES
+        qcocoaaccessibility.h qcocoaaccessibility.mm
+        qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm
+    LIBRARIES
+        Qt::AccessibilitySupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::AccessibilitySupport
+)
+
 extend_target(qcocoa CONDITION TARGET Qt::Widgets
     SOURCES
-        qcocoaprintdevice.h qcocoaprintdevice.mm
-        qcocoaprintersupport.h qcocoaprintersupport.mm
         qpaintengine_mac.mm qpaintengine_mac_p.h
-        qprintengine_mac.mm qprintengine_mac_p.h
     LIBRARIES
-        Qt::PrintSupportPrivate
         Qt::WidgetsPrivate
     PUBLIC_LIBRARIES
-        Qt::PrintSupport
         Qt::Widgets
 )
 
-#### Keys ignored in scope 5:.:.:cocoa.pro:TARGET Qt::Widgets:
+#### Keys ignored in scope 6:.:.:cocoa.pro:TARGET Qt::Widgets:
 # QT_FOR_CONFIG = "widgets"
 
+extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets
+    SOURCES
+        qcocoaprintdevice.h qcocoaprintdevice.mm
+        qcocoaprintersupport.h qcocoaprintersupport.mm
+        qprintengine_mac.mm qprintengine_mac_p.h
+    LIBRARIES
+        Qt::PrintSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::PrintSupport
+)
+
 extend_target(qcocoa CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets
     SOURCES
         qcocoacolordialoghelper.h qcocoacolordialoghelper.mm
@@ -143,5 +155,5 @@ extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets
         qcocoafontdialoghelper.h qcocoafontdialoghelper.mm
 )
 
-#### Keys ignored in scope 9:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 11:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt
index a7e95827e1..51553dde99 100644
--- a/src/tools/bootstrap/.prev_CMakeLists.txt
+++ b/src/tools/bootstrap/.prev_CMakeLists.txt
@@ -65,6 +65,7 @@ add_qt_module(Bootstrap
         ../../corelib/serialization/qxmlstream.cpp
         ../../corelib/serialization/qxmlutils.cpp
         ../../corelib/text/qbytearray.cpp
+        ../../corelib/text/qbytearraylist.cpp
         ../../corelib/text/qbytearraymatcher.cpp
         ../../corelib/text/qlocale.cpp
         ../../corelib/text/qlocale_tools.cpp
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt
index 7828155043..1882b85013 100644
--- a/src/tools/bootstrap/CMakeLists.txt
+++ b/src/tools/bootstrap/CMakeLists.txt
@@ -63,6 +63,7 @@ extend_target(Bootstrap
         ../../corelib/serialization/qxmlstream.cpp
         ../../corelib/serialization/qxmlutils.cpp
         ../../corelib/text/qbytearray.cpp
+        ../../corelib/text/qbytearraylist.cpp
         ../../corelib/text/qbytearraymatcher.cpp
         ../../corelib/text/qlocale.cpp
         ../../corelib/text/qlocale_tools.cpp
diff --git a/src/tools/moc/.prev_CMakeLists.txt b/src/tools/moc/.prev_CMakeLists.txt
index 3889b15a31..f850ec17fa 100644
--- a/src/tools/moc/.prev_CMakeLists.txt
+++ b/src/tools/moc/.prev_CMakeLists.txt
@@ -8,6 +8,7 @@ add_qt_tool(moc
     BOOTSTRAP
     SOURCES
         cbordevice.h
+        collectjson.cpp collectjson.h
         generator.cpp generator.h
         moc.cpp moc.h
         outputrevision.h
diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt
index 4c65eb9027..8ba5fc0a83 100644
--- a/src/tools/moc/CMakeLists.txt
+++ b/src/tools/moc/CMakeLists.txt
@@ -9,6 +9,7 @@ add_qt_tool(moc
     TOOLS_TARGET Core # special case
     SOURCES
         cbordevice.h
+        collectjson.cpp collectjson.h
         generator.cpp generator.h
         main.cpp  # special case
         moc.cpp moc.h
diff --git a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
index 5bcc873a43..ecb45e4416 100644
--- a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
+++ b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
@@ -7,6 +7,7 @@
 add_qt_tool(qdbuscpp2xml
     SOURCES
         ../moc/cbordevice.h
+        ../moc/collectjson.cpp ../moc/collectjson.h
         ../moc/generator.cpp ../moc/generator.h
         ../moc/moc.cpp ../moc/moc.h
         ../moc/outputrevision.h
diff --git a/src/tools/qdbuscpp2xml/CMakeLists.txt b/src/tools/qdbuscpp2xml/CMakeLists.txt
index 30ba756f34..3bf127c0f1 100644
--- a/src/tools/qdbuscpp2xml/CMakeLists.txt
+++ b/src/tools/qdbuscpp2xml/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qt_tool(qdbuscpp2xml
     TOOLS_TARGET DBus # special case
     SOURCES
         ../moc/cbordevice.h
+        ../moc/collectjson.cpp ../moc/collectjson.h
         ../moc/generator.cpp ../moc/generator.h
         ../moc/moc.cpp ../moc/moc.h
         ../moc/outputrevision.h