CMake: Regenerate projects using pro2cmake one last time

And fix up some wrong qmake project files

Pick-to: 6.0
Change-Id: I66cb82aeb9c1419a74df1a650fa78a511ade7443
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

8 files changed, 40 insertions, 12 deletions

diff --git a/tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt b/tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt
index c95195c71e..aa5f3a533d 100644
--- a/tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt
@@ -2,3 +2,4 @@
 
 add_subdirectory(app)
 add_subdirectory(test)
+add_subdirectory(test_qmessagelogger)
diff --git a/tests/auto/corelib/global/qlogging/CMakeLists.txt b/tests/auto/corelib/global/qlogging/CMakeLists.txt
index 47ee7adca0..feeffd4fc5 100644
--- a/tests/auto/corelib/global/qlogging/CMakeLists.txt
+++ b/tests/auto/corelib/global/qlogging/CMakeLists.txt
@@ -1,29 +1,28 @@
 # Generated from qlogging.pro.
-# This file is almost completely custom written # special case
+# This file is almost completely custom written
+# special case skip regeneration
 
 qt_internal_add_executable(qlogging_helper
-    NO_INSTALL # special case
-    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    NO_INSTALL
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     SOURCES app/main.cpp
     DEFINES QT_MESSAGELOGCONTEXT
     LIBRARIES Qt::Core)
 
-# special case begin
 # Fixes required for the backtrace stack to be correct
 if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND NOT MINGW)
     target_link_options(qlogging_helper PRIVATE -rdynamic)
 endif()
 set_target_properties(qlogging_helper PROPERTIES CXX_VISIBILITY_PRESET default)
-# special case end
 
 qt_internal_add_test(tst_qlogging SOURCES tst_qlogging.cpp
     DEFINES
         QT_MESSAGELOGCONTEXT
         QT_DISABLE_DEPRECATED_BEFORE=0
-        HELPER_BINARY="${CMAKE_CURRENT_BINARY_DIR}/qlogging_helper" # special case
+        HELPER_BINARY="${CMAKE_CURRENT_BINARY_DIR}/qlogging_helper"
 )
 
-target_compile_definitions(tst_qlogging PRIVATE QT_CMAKE_BUILD) # special case # to fix the binary name
+target_compile_definitions(tst_qlogging PRIVATE QT_CMAKE_BUILD) # to fix the binary name
 
 qt_internal_add_test(tst_qmessagelogger SOURCES tst_qmessagelogger.cpp
     DEFINES
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt
index b3c0879605..31ee565109 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qmimedatabase-cache
 )
 
 # Resources:
-set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
+set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/worktrees/dev/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
     PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
 )
 set(mimetypes_resource_files
@@ -28,7 +28,7 @@ qt_internal_add_resource(tst_qmimedatabase-cache "mimetypes"
     PREFIX
         "/qt-project.org/qmime/packages"
     BASE
-        "/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes"
+        "/Volumes/T3/Dev/qt/qt5_cmake/worktrees/dev/qtbase/src/corelib/mimetypes"
     FILES
         ${mimetypes_resource_files}
 )
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt
index b1cabd0b7e..66d6e8414c 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_test(tst_qmimedatabase-xml
 )
 
 # Resources:
-set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
+set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/worktrees/dev/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
     PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
 )
 set(mimetypes_resource_files
@@ -28,7 +28,7 @@ qt_internal_add_resource(tst_qmimedatabase-xml "mimetypes"
     PREFIX
         "/qt-project.org/qmime/packages"
     BASE
-        "/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes"
+        "/Volumes/T3/Dev/qt/qt5_cmake/worktrees/dev/qtbase/src/corelib/mimetypes"
     FILES
         ${mimetypes_resource_files}
 )
diff --git a/tests/auto/corelib/serialization/.prev_CMakeLists.txt b/tests/auto/corelib/serialization/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..59fe15de4c
--- /dev/null
+++ b/tests/auto/corelib/serialization/.prev_CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from serialization.pro.
+
+add_subdirectory(json)
+add_subdirectory(qcborstreamreader)
+add_subdirectory(qcborstreamwriter)
+add_subdirectory(qcborvalue)
+add_subdirectory(qcborvalue_json)
+if(TARGET Qt::Gui)
+    add_subdirectory(qdatastream)
+    add_subdirectory(qdatastream_core_pixmap)
+endif()
+if(TARGET Qt::Network)
+    add_subdirectory(qtextstream)
+endif()
+if(TARGET Qt::Network AND TARGET Qt::Xml AND NOT ANDROID)
+    add_subdirectory(qxmlstream)
+endif()
diff --git a/tests/auto/corelib/text/.prev_CMakeLists.txt b/tests/auto/corelib/text/.prev_CMakeLists.txt
index aa2b8f31b2..5ac3fa208a 100644
--- a/tests/auto/corelib/text/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/text/.prev_CMakeLists.txt
@@ -1,20 +1,26 @@
 # Generated from text.pro.
 
 add_subdirectory(qbytearray)
+add_subdirectory(qbytearrayapisymmetry)
 add_subdirectory(qbytearraylist)
 add_subdirectory(qbytearraymatcher)
+add_subdirectory(qbytearrayview)
 add_subdirectory(qbytedatabuffer)
 add_subdirectory(qchar)
 add_subdirectory(qcollator)
 add_subdirectory(qlatin1string)
-add_subdirectory(qlocale)
 add_subdirectory(qregularexpression)
 add_subdirectory(qstring)
 add_subdirectory(qstring_no_cast_from_bytearray)
 add_subdirectory(qstringapisymmetry)
 add_subdirectory(qstringbuilder)
+add_subdirectory(qstringconverter)
 add_subdirectory(qstringiterator)
 add_subdirectory(qstringlist)
 add_subdirectory(qstringmatcher)
+add_subdirectory(qstringtokenizer)
 add_subdirectory(qstringview)
 add_subdirectory(qtextboundaryfinder)
+if(NOT ANDROID)
+    add_subdirectory(qlocale)
+endif()
diff --git a/tests/auto/corelib/time/qdatetimeparser/CMakeLists.txt b/tests/auto/corelib/time/qdatetimeparser/CMakeLists.txt
index df9fe43958..9bdeb62501 100644
--- a/tests/auto/corelib/time/qdatetimeparser/CMakeLists.txt
+++ b/tests/auto/corelib/time/qdatetimeparser/CMakeLists.txt
@@ -1,3 +1,5 @@
+# Generated from qdatetimeparser.pro.
+
 #####################################################################
 ## tst_qdatetimeparser Test:
 #####################################################################
diff --git a/tests/auto/corelib/tools/containerapisymmetry/CMakeLists.txt b/tests/auto/corelib/tools/containerapisymmetry/CMakeLists.txt
index f640996a53..68d6f4bc0e 100644
--- a/tests/auto/corelib/tools/containerapisymmetry/CMakeLists.txt
+++ b/tests/auto/corelib/tools/containerapisymmetry/CMakeLists.txt
@@ -8,3 +8,6 @@ qt_internal_add_test(tst_containerapisymmetry
     SOURCES
         tst_containerapisymmetry.cpp
 )
+
+## Scopes:
+#####################################################################