CMake: Regenerate projects using pro2cmake one last time

And fix up some wrong qmake project files

Change-Id: I66cb82aeb9c1419a74df1a650fa78a511ade7443
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 2304acab5ff3bd3832c2e388cfdab27f2a95caa8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

6 files changed, 43 insertions, 22 deletions

diff --git a/tests/auto/gui/image/.prev_CMakeLists.txt b/tests/auto/gui/image/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..1eecb03af6
--- /dev/null
+++ b/tests/auto/gui/image/.prev_CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from image.pro.
+
+if(TARGET Qt::Network AND NOT ANDROID)
+    add_subdirectory(qimagereader)
+endif()
+add_subdirectory(qicoimageformat)
+add_subdirectory(qpixmap)
+add_subdirectory(qimage)
+add_subdirectory(qimageiohandler)
+add_subdirectory(qimagewriter)
+add_subdirectory(qmovie)
+add_subdirectory(qpicture)
+add_subdirectory(qiconhighdpi)
+if(QT_FEATURE_private_tests)
+    add_subdirectory(qpixmapcache)
+endif()
+if(NOT ANDROID)
+    add_subdirectory(qicon)
+endif()
diff --git a/tests/auto/gui/kernel/.prev_CMakeLists.txt b/tests/auto/gui/kernel/.prev_CMakeLists.txt
index 33c8b35391..85dc42305f 100644
--- a/tests/auto/gui/kernel/.prev_CMakeLists.txt
+++ b/tests/auto/gui/kernel/.prev_CMakeLists.txt
@@ -11,6 +11,7 @@ add_subdirectory(qevent)
 add_subdirectory(qfileopenevent)
 add_subdirectory(qguieventdispatcher)
 add_subdirectory(qguitimer)
+add_subdirectory(qhighdpi)
 add_subdirectory(qinputdevice)
 add_subdirectory(qinputmethod)
 add_subdirectory(qkeyevent)
@@ -35,9 +36,6 @@ if(QT_FEATURE_shortcut)
     add_subdirectory(qkeysequence)
     add_subdirectory(qshortcut)
 endif()
-if(QT_FEATURE_highdpiscaling)
-    add_subdirectory(qhighdpiscaling)
-endif()
 if(TARGET Qt::Widgets)
     add_subdirectory(qmouseevent_modal)
     add_subdirectory(qtouchevent)
diff --git a/tests/auto/gui/kernel/CMakeLists.txt b/tests/auto/gui/kernel/CMakeLists.txt
index a22c0262c5..e19ee9a75c 100644
--- a/tests/auto/gui/kernel/CMakeLists.txt
+++ b/tests/auto/gui/kernel/CMakeLists.txt
@@ -11,6 +11,7 @@ add_subdirectory(qevent)
 add_subdirectory(qfileopenevent)
 add_subdirectory(qguieventdispatcher)
 add_subdirectory(qguitimer)
+add_subdirectory(qhighdpi)
 add_subdirectory(qinputdevice)
 add_subdirectory(qinputmethod)
 add_subdirectory(qkeyevent)
@@ -35,9 +36,6 @@ if(QT_FEATURE_shortcut)
     add_subdirectory(qkeysequence)
     add_subdirectory(qshortcut)
 endif()
-if(QT_FEATURE_highdpiscaling)
-    add_subdirectory(qhighdpi)
-endif()
 if(TARGET Qt::Widgets)
     add_subdirectory(qmouseevent_modal)
     add_subdirectory(qtouchevent)
diff --git a/tests/auto/gui/kernel/kernel.pro b/tests/auto/gui/kernel/kernel.pro
index 82b7baba54..88108453b8 100644
--- a/tests/auto/gui/kernel/kernel.pro
+++ b/tests/auto/gui/kernel/kernel.pro
@@ -51,8 +51,6 @@ win32:qtHaveModule(network): SUBDIRS += noqteventloop
    qaction \
    qactiongroup
 
-!qtConfig(highdpiscaling): SUBDIRS -= qhighdpiscaling
-
 !qtConfig(opengl): SUBDIRS -= qopenglwindow
 
 android|uikit: SUBDIRS -= qclipboard
diff --git a/tests/auto/gui/kernel/qhighdpiscaling/CMakeLists.txt b/tests/auto/gui/kernel/qhighdpiscaling/CMakeLists.txt
deleted file mode 100644
index 9db351dbda..0000000000
--- a/tests/auto/gui/kernel/qhighdpiscaling/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated from qhighdpiscaling.pro.
-
-#####################################################################
-## tst_qhighdpiscaling Test:
-#####################################################################
-
-qt_internal_add_test(tst_qhighdpiscaling
-    SOURCES
-        tst_qhighdpiscaling.cpp
-    PUBLIC_LIBRARIES
-        Qt::CorePrivate
-        Qt::Gui
-        Qt::GuiPrivate
-)
diff --git a/tests/auto/gui/painting/.prev_CMakeLists.txt b/tests/auto/gui/painting/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..0cedaffebb
--- /dev/null
+++ b/tests/auto/gui/painting/.prev_CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from painting.pro.
+
+add_subdirectory(qpainterpath)
+add_subdirectory(qpainterpathstroker)
+add_subdirectory(qcolor)
+add_subdirectory(qbrush)
+add_subdirectory(qregion)
+add_subdirectory(qpagelayout)
+add_subdirectory(qpageranges)
+add_subdirectory(qpagesize)
+add_subdirectory(qpainter)
+add_subdirectory(qpdfwriter)
+add_subdirectory(qpen)
+add_subdirectory(qpaintengine)
+add_subdirectory(qtransform)
+add_subdirectory(qpolygon)
+if(NOT ANDROID)
+    add_subdirectory(qcolorspace)
+endif()
+if(QT_FEATURE_private_tests)
+    add_subdirectory(qpathclipper)
+endif()