summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-02-08 14:26:33 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2023-02-09 13:49:03 +0100
commita983cf7572ab3e8f351e89cd2c9b6ef8b7e68f60 (patch)
treec9bc3f62301d0071ecc2519a2ed227a1638a2154 /src
parent8c616b587c13f161ab3f6de7cb1b18e8d97d2300 (diff)
Remove remains of qmake conversion from CMakeLists.txt files
Pick-to: 6.5 Change-Id: I1e1a376363224b88354da3e30fcea877f0e82f41 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/activeqt/CMakeLists.txt15
-rw-r--r--src/activeqt/axbase/CMakeLists.txt7
-rw-r--r--src/activeqt/container/CMakeLists.txt8
-rw-r--r--src/activeqt/control/CMakeLists.txt8
-rw-r--r--src/activeqt/doc/CMakeLists.txt2
-rw-r--r--src/tools/CMakeLists.txt2
-rw-r--r--src/tools/idc/CMakeLists.txt11
8 files changed, 5 insertions, 50 deletions
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"