diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-08 14:26:33 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-09 13:49:03 +0100 |
commit | a983cf7572ab3e8f351e89cd2c9b6ef8b7e68f60 (patch) | |
tree | c9bc3f62301d0071ecc2519a2ed227a1638a2154 /tools | |
parent | 8c616b587c13f161ab3f6de7cb1b18e8d97d2300 (diff) | |
download | qtactiveqt-a983cf7572ab3e8f351e89cd2c9b6ef8b7e68f60.tar.gz |
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 'tools')
-rw-r--r-- | tools/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tools/dumpcpp/CMakeLists.txt | 9 | ||||
-rw-r--r-- | tools/dumpdoc/CMakeLists.txt | 9 | ||||
-rw-r--r-- | tools/testcon/CMakeLists.txt | 19 |
4 files changed, 6 insertions, 34 deletions
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)" |