Remove remains of qmake conversion from CMakeLists.txt files

Pick-to: 6.5
Change-Id: I1e1a376363224b88354da3e30fcea877f0e82f41
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

23 files changed, 22 insertions, 141 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a647f6..20e6d3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,12 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from qtactiveqt.pro.
-
 cmake_minimum_required(VERSION 3.16)
 
 include(".cmake.conf")
-project(QtActiveQt # special case
+project(QtActiveQt
     VERSION "${QT_REPO_MODULE_VERSION}"
-    DESCRIPTION "Qt Active Qt Libraries" # special case
+    DESCRIPTION "Qt Active Qt Libraries"
     HOMEPAGE_URL "https://qt.io/"
     LANGUAGES CXX C
 )
@@ -25,12 +23,10 @@ if (NOT WIN32)
     return()
 endif()
 
-find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case
-# special case begin
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core)
 find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Qml Quick Gui Widgets
     PrintSupport OpenGL OpenGLWidgets
 )
-# special case end
 if(NOT TARGET Qt::Gui OR NOT TARGET Qt::Widgets OR NOT TARGET Qt::PrintSupport)
     message(NOTICE "Skipping the build as the condition \"TARGET Qt::Gui\", \"TARGET Qt::Widget\" "
             "or \"TARGET Qt::Printsupport\" is not met.")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c5aa7db..d7ec6d0 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.
-
 add_subdirectory(activeqt)
 if(WIN32)
     add_subdirectory(tools)
diff --git a/src/activeqt/CMakeLists.txt b/src/activeqt/CMakeLists.txt
index 991a071..bf00469 100644
--- a/src/activeqt/CMakeLists.txt
+++ b/src/activeqt/CMakeLists.txt
@@ -1,9 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from activeqt.pro.
-
-# special case begin
 add_subdirectory(axbase)
 add_subdirectory(control)
 add_subdirectory(container)
@@ -35,15 +32,3 @@ qt_internal_add_module(ActiveQt
 qt_internal_add_docs(ActiveQt
     doc/activeqt.qdocconf
 )
-
-# special case end
-## Scopes:
-#####################################################################
-
-#### Keys ignored in scope 2:.:.:activeqt.pro:WIN32:
-# SUBDIRS = "axbase" "control" "container" "activeqt"
-# TEMPLATE = "subdirs"
-# activeqt.file = "activeqt.prx"
-
-#### Keys ignored in scope 3:.:.:activeqt.pro:else:
-# TEMPLATE = "aux"
diff --git a/src/activeqt/axbase/CMakeLists.txt b/src/activeqt/axbase/CMakeLists.txt
index 3dd26df..5cb4a9b 100644
--- a/src/activeqt/axbase/CMakeLists.txt
+++ b/src/activeqt/axbase/CMakeLists.txt
@@ -1,13 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from axbase.pro.
-
 #####################################################################
 ## AxBase Module:
 #####################################################################
 
-qt_internal_add_module(AxBasePrivate # special case
+qt_internal_add_module(AxBasePrivate
     STATIC
     INTERNAL_MODULE
     SOURCES
@@ -27,9 +25,6 @@ qt_internal_add_module(AxBasePrivate # special case
         Qt::Widgets
 )
 
-#### Keys ignored in scope 1:.:.:axbase.pro:<TRUE>:
-# MODULE = "axbase"
-
 ## Scopes:
 #####################################################################
 
diff --git a/src/activeqt/container/CMakeLists.txt b/src/activeqt/container/CMakeLists.txt
index ca14c4a..474393a 100644
--- a/src/activeqt/container/CMakeLists.txt
+++ b/src/activeqt/container/CMakeLists.txt
@@ -1,13 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from container.pro.
-
 #####################################################################
 ## AxContainer Module:
 #####################################################################
 
-qt_internal_add_module(AxContainer # special case
+qt_internal_add_module(AxContainer
     STATIC
     QMAKE_MODULE_CONFIG dumpcpp
     SOURCES
@@ -33,7 +31,3 @@ qt_internal_add_module(AxContainer # special case
     ENABLE_AUTOGEN_TOOLS
         uic
 )
-
-#### Keys ignored in scope 1:.:.:container.pro:<TRUE>:
-# MODULE = "axcontainer"
-# MODULE_CONFIG = "dumpcpp"
diff --git a/src/activeqt/control/CMakeLists.txt b/src/activeqt/control/CMakeLists.txt
index f00e0f2..0cb3d4c 100644
--- a/src/activeqt/control/CMakeLists.txt
+++ b/src/activeqt/control/CMakeLists.txt
@@ -1,13 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from control.pro.
-
 #####################################################################
 ## AxServer Module:
 #####################################################################
 
-qt_internal_add_module(AxServer # special case
+qt_internal_add_module(AxServer
     STATIC
     QMAKE_MODULE_CONFIG idcidl force_import_plugins
     SOURCES
@@ -37,10 +35,6 @@ qt_internal_add_module(AxServer # special case
         shell32
 )
 
-#### Keys ignored in scope 1:.:.:control.pro:<TRUE>:
-# MODULE = "axserver"
-# MODULE_CONFIG = "idcidl" "force_import_plugins"
-
 ## Scopes:
 #####################################################################
 
diff --git a/src/activeqt/doc/CMakeLists.txt b/src/activeqt/doc/CMakeLists.txt
index d1392dd..c9ff536 100644
--- a/src/activeqt/doc/CMakeLists.txt
+++ b/src/activeqt/doc/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# special case skip regeneration
-
 add_library(ActiveQt INTERFACE)
 target_link_libraries(ActiveQt INTERFACE Qt::Core)
 qt_internal_add_docs(ActiveQt activeqt.qdocconf)
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 343f962..2f6644c 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -1,6 +1,4 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from tools.pro.
-
 add_subdirectory(idc)
diff --git a/src/tools/idc/CMakeLists.txt b/src/tools/idc/CMakeLists.txt
index c7ad1c5..f1d784e 100644
--- a/src/tools/idc/CMakeLists.txt
+++ b/src/tools/idc/CMakeLists.txt
@@ -1,22 +1,15 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from idc.pro.
-
 #####################################################################
 ## idc Tool:
 #####################################################################
 
 qt_get_tool_target_name(target_name idc)
-qt_internal_add_tool(${target_name} # special case
-#    BOOTSTRAP # special case
+qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "Active Qt Interface Description Compiler"
-    TOOLS_TARGET AxServer # special case
+    TOOLS_TARGET AxServer
     SOURCES
         main.cpp
 )
 qt_internal_return_unless_building_tools()
-
-#### Keys ignored in scope 1:.:.:idc.pro:<TRUE>:
-# QMAKE_TARGET_DESCRIPTION = "Active Qt Interface Description Compiler"
-# _OPTION = "host_build"
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 800bc26..05cc44c 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 21dd4e5..acf0406 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from auto.pro.
-
 add_subdirectory(conversion)
 add_subdirectory(qaxobject)
 add_subdirectory(dumpcpp)
diff --git a/tests/auto/conversion/CMakeLists.txt b/tests/auto/conversion/CMakeLists.txt
index 83ff23c..9582dd5 100644
--- a/tests/auto/conversion/CMakeLists.txt
+++ b/tests/auto/conversion/CMakeLists.txt
@@ -1,13 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from conversion.pro.
-
 #####################################################################
 ## conversion Test:
 #####################################################################
 
-qt_internal_add_test(conversion # special case
+qt_internal_add_test(conversion
     SOURCES
         tst_conversion.cpp
     LIBRARIES
diff --git a/tests/auto/dumpcpp/CMakeLists.txt b/tests/auto/dumpcpp/CMakeLists.txt
index 85cdfe1..ebc72ca 100644
--- a/tests/auto/dumpcpp/CMakeLists.txt
+++ b/tests/auto/dumpcpp/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from dumpcpp.pro.
-
 #####################################################################
 ## tst_dumpcpp Test:
 #####################################################################
@@ -16,10 +14,4 @@ qt_internal_add_test(tst_dumpcpp
         Qt::Widgets
 )
 
-#### Keys ignored in scope 1:.:.:dumpcpp.pro:<TRUE>:
-# TYPELIBS = "$$(SystemRoot)\\system32\\ieframe.dll"
-
-qt6_target_typelibs(tst_dumpcpp LIBRARIES "ieframe.dll") # special case
-
-## Scopes:
-#####################################################################
+qt6_target_typelibs(tst_dumpcpp LIBRARIES "ieframe.dll")
diff --git a/tests/auto/qaxobject/CMakeLists.txt b/tests/auto/qaxobject/CMakeLists.txt
index b94a9e0..63ff55c 100644
--- a/tests/auto/qaxobject/CMakeLists.txt
+++ b/tests/auto/qaxobject/CMakeLists.txt
@@ -1,13 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from qaxobject.pro.
-
 #####################################################################
 ## qaxobject Test:
 #####################################################################
 
-qt_internal_add_test(qaxobject # special case
+qt_internal_add_test(qaxobject
     SOURCES
         tst_qaxobject.cpp
     LIBRARIES
diff --git a/tests/auto/qaxscript/CMakeLists.txt b/tests/auto/qaxscript/CMakeLists.txt
index 95746a7..fc6ca00 100644
--- a/tests/auto/qaxscript/CMakeLists.txt
+++ b/tests/auto/qaxscript/CMakeLists.txt
@@ -1,13 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from qaxscript.pro.
-
 #####################################################################
 ## qaxscript Test:
 #####################################################################
 
-qt_internal_add_test(qaxscript # special case
+qt_internal_add_test(qaxscript
     SOURCES
         tst_qaxscript.cpp
     LIBRARIES
diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt
index 1cdb27f..2a55b2d 100644
--- a/tests/manual/CMakeLists.txt
+++ b/tests/manual/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from manual.pro.
-
 add_subdirectory(axviewer)
 add_subdirectory(dumpcpp)
 add_subdirectory(testcontrol)
diff --git a/tests/manual/axviewer/CMakeLists.txt b/tests/manual/axviewer/CMakeLists.txt
index bb769f9..22f8f3a 100644
--- a/tests/manual/axviewer/CMakeLists.txt
+++ b/tests/manual/axviewer/CMakeLists.txt
@@ -1,13 +1,12 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from axviewer.pro.
 
 #####################################################################
 ## axviewer Binary:
 #####################################################################
 
-qt_internal_add_manual_test(tst_axviewer_manual # special case
+qt_internal_add_manual_test(tst_axviewer_manual
     SOURCES
         ../shared/metaobjectdump.cpp ../shared/metaobjectdump.h
         ../shared/textdialog.cpp ../shared/textdialog.h
@@ -20,14 +19,9 @@ qt_internal_add_manual_test(tst_axviewer_manual # special case
         Qt::Widgets
 )
 
-#### Keys ignored in scope 1:.:.:axviewer.pro:<TRUE>:
-# DIAGLIB = "../../../../qtbase/tests/manual/diaglib"
-# TEMPLATE = "app"
-
 ## Scopes:
 #####################################################################
 
-# special case begin
 set(diaglib_path "${CMAKE_CURRENT_SOURCE_DIR}/../../../../qtbase/tests/manual/diaglib")
 qt_internal_extend_target(tst_axviewer_manual CONDITION EXISTS "${diaglib_path}"
     SOURCES
@@ -74,4 +68,3 @@ qt_internal_extend_target(tst_axviewer_manual CONDITION (EXISTS "${diaglib_path}
         Qt::OpenGL
         Qt::OpenGLWidgets
 )
-# special case end
diff --git a/tests/manual/dumpcpp/CMakeLists.txt b/tests/manual/dumpcpp/CMakeLists.txt
index d0ba74e..e9ffc1a 100644
--- a/tests/manual/dumpcpp/CMakeLists.txt
+++ b/tests/manual/dumpcpp/CMakeLists.txt
@@ -1,13 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from dumpcpp.pro.
-
 #####################################################################
 ## dumpcpp Binary:
 #####################################################################
 
-qt_internal_add_manual_test(tst_dumpcpp_manual # special case
+qt_internal_add_manual_test(tst_dumpcpp_manual
     SOURCES
         ../shared/metaobjectdump.cpp ../shared/metaobjectdump.h
         ../shared/textdialog.cpp ../shared/textdialog.h
@@ -21,11 +19,4 @@ qt_internal_add_manual_test(tst_dumpcpp_manual # special case
         Qt::Widgets
 )
 
-#### Keys ignored in scope 1:.:.:dumpcpp.pro:<TRUE>:
-# TEMPLATE = "app"
-# TYPELIBS = "$$(SystemRoot)\\system32\\ieframe.dll"
-
-qt6_target_typelibs(tst_dumpcpp_manual LIBRARIES "ieframe.dll") # special case
-
-## Scopes:
-#####################################################################
+qt6_target_typelibs(tst_dumpcpp_manual LIBRARIES "ieframe.dll")
diff --git a/tests/manual/testcontrol/CMakeLists.txt b/tests/manual/testcontrol/CMakeLists.txt
index 5513e96..78e410c 100644
--- a/tests/manual/testcontrol/CMakeLists.txt
+++ b/tests/manual/testcontrol/CMakeLists.txt
@@ -1,13 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from testcontrol.pro.
-
 #####################################################################
 ## testcontrol Binary:
 #####################################################################
 
-qt_internal_add_manual_test(tst_testcontrol_manual # special case
+qt_internal_add_manual_test(tst_testcontrol_manual
     GUI
     SOURCES
         main.cpp
@@ -19,7 +17,3 @@ qt_internal_add_manual_test(tst_testcontrol_manual # special case
 )
 qt_disable_warnings(tst_testcontrol_manual)
 qt6_target_idl(tst_testcontrol_manual)
-
-#### Keys ignored in scope 1:.:.:testcontrol.pro:<TRUE>:
-# RC_FILE = "testcontrol.rc"
-# TEMPLATE = "app"
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index a379fba..bfbe5fd 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,9 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from tools.pro.
-
-
 qt_exclude_tool_directories_from_default_target(
     testcon
 )
diff --git a/tools/dumpcpp/CMakeLists.txt b/tools/dumpcpp/CMakeLists.txt
index f1982ac..571f830 100644
--- a/tools/dumpcpp/CMakeLists.txt
+++ b/tools/dumpcpp/CMakeLists.txt
@@ -1,16 +1,14 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from dumpcpp.pro.
-
 #####################################################################
 ## dumpcpp Tool:
 #####################################################################
 
 qt_get_tool_target_name(target_name dumpcpp)
-qt_internal_add_tool(${target_name} # special case
+qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "Active Qt DumpCpp"
-    TOOLS_TARGET AxContainer # special case
+    TOOLS_TARGET AxContainer
     SOURCES
         main.cpp
         moc.cpp moc.h
@@ -24,6 +22,3 @@ qt_internal_add_tool(${target_name} # special case
         Qt::Widgets
 )
 qt_internal_return_unless_building_tools()
-
-#### Keys ignored in scope 1:.:.:dumpcpp.pro:<TRUE>:
-# QMAKE_TARGET_DESCRIPTION = "Active Qt DumpCpp"
diff --git a/tools/dumpdoc/CMakeLists.txt b/tools/dumpdoc/CMakeLists.txt
index d3d26aa..84b4018 100644
--- a/tools/dumpdoc/CMakeLists.txt
+++ b/tools/dumpdoc/CMakeLists.txt
@@ -1,16 +1,14 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from dumpdoc.pro.
-
 #####################################################################
 ## dumpdoc Tool:
 #####################################################################
 
 qt_get_tool_target_name(target_name dumpdoc)
-qt_internal_add_tool(${target_name} # special case
+qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "Active Qt DumpDoc"
-    TOOLS_TARGET AxContainer # special case
+    TOOLS_TARGET AxContainer
     SOURCES
         main.cpp
     LIBRARIES
@@ -19,6 +17,3 @@ qt_internal_add_tool(${target_name} # special case
         Qt::Widgets
 )
 qt_internal_return_unless_building_tools()
-
-#### Keys ignored in scope 1:.:.:dumpdoc.pro:<TRUE>:
-# QMAKE_TARGET_DESCRIPTION = "Active Qt DumpDoc"
diff --git a/tools/testcon/CMakeLists.txt b/tools/testcon/CMakeLists.txt
index fb51427..50ebd69 100644
--- a/tools/testcon/CMakeLists.txt
+++ b/tools/testcon/CMakeLists.txt
@@ -1,15 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from testcon.pro.
-
 #####################################################################
 ## testcon Binary:
 #####################################################################
 
-qt_internal_add_app(testcon # special case
-#    OUTPUT_DIRECTORY "$$[QT_INSTALL_BINS]" # special case
-#    INSTALL_DIRECTORY "$$[QT_INSTALL_BINS]" # special case
+qt_internal_add_app(testcon
     SOURCES
         ambientproperties.cpp ambientproperties.h ambientproperties.ui
         changeproperties.cpp changeproperties.h changeproperties.ui
@@ -37,20 +33,9 @@ set(testcon_resource_files
     "images/filenew.png"
 )
 
-qt_internal_add_resource(testcon "testcon" # special case
+qt_internal_add_resource(testcon "testcon"
     PREFIX
         "/"
     FILES
         ${testcon_resource_files}
 )
-
-
-#### Keys ignored in scope 1:.:.:testcon.pro:<TRUE>:
-# RC_FILE = "testcon.rc"
-# TEMPLATE = "app"
-
-## Scopes:
-#####################################################################
-
-#### Keys ignored in scope 2:.:.:testcon.pro:NOT MINGW:
-# QMAKE_POST_LINK = "midl" "$$shell_quote($$shell_path $$PWD/testcon.idl)" "&&" "move" "testcon.tlb" "$(TARGETDIR)"