Remove remains of qmake conversion from CMakeLists.txt files

Pick-to: 6.5
Change-Id: I8720313b2bc9cf9312a1f1a3d40171e1b2c8a257
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

16 files changed, 7 insertions, 52 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8af6f8..a91223b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,20 +1,18 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from qtsvg.pro.
-
 cmake_minimum_required(VERSION 3.16)
 
 include(.cmake.conf)
 project(QtSvg
     VERSION "${QT_REPO_MODULE_VERSION}"
-    DESCRIPTION "Qt SVG Libraries" # special case
+    DESCRIPTION "Qt SVG Libraries"
     HOMEPAGE_URL "https://qt.io/"
     LANGUAGES CXX C
 )
 
-find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case
-find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui Widgets Xml) # special case
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core)
+find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui Widgets Xml)
 
 # Needed for examples to configure properly when not using ExternalProject and when
 # Qt is configured with a bundled zlib.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0bed3a6..a139a05 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from src.pro.
-
 if(TARGET Qt::Gui)
     add_subdirectory(svg)
     add_subdirectory(plugins)
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 8bf3900..e71099a 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from plugins.pro.
-
 add_subdirectory(iconengines)
 if(QT_FEATURE_imageformatplugin)
     add_subdirectory(imageformats)
diff --git a/src/plugins/iconengines/CMakeLists.txt b/src/plugins/iconengines/CMakeLists.txt
index c54ad9a..bb8d2d3 100644
--- a/src/plugins/iconengines/CMakeLists.txt
+++ b/src/plugins/iconengines/CMakeLists.txt
@@ -1,6 +1,4 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from iconengines.pro.
-
 add_subdirectory(svgiconengine)
diff --git a/src/plugins/iconengines/svgiconengine/CMakeLists.txt b/src/plugins/iconengines/svgiconengine/CMakeLists.txt
index aeb04ab..7e4c4a6 100644
--- a/src/plugins/iconengines/svgiconengine/CMakeLists.txt
+++ b/src/plugins/iconengines/svgiconengine/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from svgiconengine.pro.
-
 #####################################################################
 ## QSvgIconPlugin Plugin:
 #####################################################################
@@ -20,7 +18,3 @@ qt_internal_add_plugin(QSvgIconPlugin
         Qt::GuiPrivate
         Qt::Svg
 )
-
-#### Keys ignored in scope 1:.:.:svgiconengine.pro:<TRUE>:
-# OTHER_FILES = "qsvgiconengine.json" "qsvgiconengine-nocompress.json"
-# PLUGIN_EXTENDS = "svg"
diff --git a/src/plugins/imageformats/CMakeLists.txt b/src/plugins/imageformats/CMakeLists.txt
index c8724b7..858c5c1 100644
--- a/src/plugins/imageformats/CMakeLists.txt
+++ b/src/plugins/imageformats/CMakeLists.txt
@@ -1,6 +1,4 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from imageformats.pro.
-
 add_subdirectory(svg)
diff --git a/src/plugins/imageformats/svg/CMakeLists.txt b/src/plugins/imageformats/svg/CMakeLists.txt
index b74a9f2..140e281 100644
--- a/src/plugins/imageformats/svg/CMakeLists.txt
+++ b/src/plugins/imageformats/svg/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from svg.pro.
-
 #####################################################################
 ## QSvgPlugin Plugin:
 #####################################################################
@@ -18,6 +16,3 @@ qt_internal_add_plugin(QSvgPlugin
         Qt::Gui
         Qt::Svg
 )
-
-#### Keys ignored in scope 1:.:.:svg.pro:<TRUE>:
-# PLUGIN_EXTENDS = "svg"
diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt
index b748184..ff2c0df 100644
--- a/src/svg/CMakeLists.txt
+++ b/src/svg/CMakeLists.txt
@@ -1,20 +1,16 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from svg.pro.
-
 #####################################################################
 ## Svg Module:
 #####################################################################
 
-# special case begin
 # Handle the conditional finding of either system zlib or qt zlib.
 if(NOT QT_FEATURE_system_zlib)
     find_package(Qt6 COMPONENTS ZlibPrivate)
 elseif(NOT TARGET WrapZLIB::WrapZLIB)
     qt_find_package(WrapZLIB PROVIDED_TARGETS WrapZLIB::WrapZLIB)
 endif()
-# special case end
 
 qt_internal_add_module(Svg
     SOURCES
@@ -51,9 +47,6 @@ qt_internal_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUA
         "/BASE:0x66000000"
 )
 
-#### Keys ignored in scope 4:.:.:svg.pro:solaris-cc_x_:
-# QMAKE_CXXFLAGS_RELEASE = "--O2"
-
 qt_internal_extend_target(Svg CONDITION QT_FEATURE_system_zlib
     LIBRARIES
         WrapZLIB::WrapZLIB
@@ -66,4 +59,3 @@ qt_internal_extend_target(Svg CONDITION NOT QT_FEATURE_system_zlib
 qt_internal_add_docs(Svg
     doc/qtsvg.qdocconf
 )
-
diff --git a/src/svgwidgets/CMakeLists.txt b/src/svgwidgets/CMakeLists.txt
index 5a4a42b..8708799 100644
--- a/src/svgwidgets/CMakeLists.txt
+++ b/src/svgwidgets/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from svgwidgets.pro.
-
 #####################################################################
 ## SvgWidgets Module:
 #####################################################################
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2260787..bca1d9d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from tests.pro.
-
 if(QT_BUILD_STANDALONE_TESTS)
     # Add qt_find_package calls for extra dependencies that need to be found when building
     # the standalone tests here.
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 4d32595..c5c9961 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -11,9 +11,9 @@ endif()
 
 if(TARGET Qt::Widgets)
     add_subdirectory(qsvgdevice)
-    if(TARGET Qt::Xml) # special case
-        add_subdirectory(qsvggenerator) # special case
-    endif() # special case
+    if(TARGET Qt::Xml)
+        add_subdirectory(qsvggenerator)
+    endif()
     add_subdirectory(qsvgplugin)
     add_subdirectory(qicon_svg)
     # add_subdirectory(cmake) # special case remove
diff --git a/tests/auto/qicon_svg/CMakeLists.txt b/tests/auto/qicon_svg/CMakeLists.txt
index 5de2874..3122816 100644
--- a/tests/auto/qicon_svg/CMakeLists.txt
+++ b/tests/auto/qicon_svg/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from qicon_svg.pro.
-
 #####################################################################
 ## tst_qicon_svg Test:
 #####################################################################
@@ -14,7 +12,7 @@ file(GLOB_RECURSE test_data_glob
 list(APPEND test_data ${test_data_glob})
 
 qt_internal_add_test(tst_qicon_svg
-    LOWDPI # special case
+    LOWDPI
     SOURCES
         tst_qicon_svg.cpp
     LIBRARIES
diff --git a/tests/auto/qsvgdevice/CMakeLists.txt b/tests/auto/qsvgdevice/CMakeLists.txt
index 24c14d2..424dc42 100644
--- a/tests/auto/qsvgdevice/CMakeLists.txt
+++ b/tests/auto/qsvgdevice/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from qsvgdevice.pro.
-
 #####################################################################
 ## tst_qsvgdevice Test:
 #####################################################################
diff --git a/tests/auto/qsvggenerator/CMakeLists.txt b/tests/auto/qsvggenerator/CMakeLists.txt
index 488b016..bc07012 100644
--- a/tests/auto/qsvggenerator/CMakeLists.txt
+++ b/tests/auto/qsvggenerator/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from qsvggenerator.pro.
-
 #####################################################################
 ## tst_qsvggenerator Test:
 #####################################################################
diff --git a/tests/auto/qsvgplugin/CMakeLists.txt b/tests/auto/qsvgplugin/CMakeLists.txt
index 61a08b9..e678708 100644
--- a/tests/auto/qsvgplugin/CMakeLists.txt
+++ b/tests/auto/qsvgplugin/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from qsvgplugin.pro.
-
 #####################################################################
 ## tst_qsvgplugin Test:
 #####################################################################
@@ -47,4 +45,3 @@ qt_internal_add_resource(tst_qsvgplugin "resources"
     FILES
         ${resources_resource_files}
 )
-
diff --git a/tests/auto/qsvgrenderer/CMakeLists.txt b/tests/auto/qsvgrenderer/CMakeLists.txt
index 270e87a..c67c14b 100644
--- a/tests/auto/qsvgrenderer/CMakeLists.txt
+++ b/tests/auto/qsvgrenderer/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from qsvgrenderer.pro.
-
 #####################################################################
 ## tst_qsvgrenderer Test:
 #####################################################################
@@ -32,4 +30,3 @@ qt_internal_add_resource(tst_qsvgrenderer "resources"
     FILES
         ${resources_resource_files}
 )
-