summaryrefslogtreecommitdiff
path: root/tests/manual
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 /tests/manual
parent8c616b587c13f161ab3f6de7cb1b18e8d97d2300 (diff)
downloadqtactiveqt-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 'tests/manual')
-rw-r--r--tests/manual/CMakeLists.txt2
-rw-r--r--tests/manual/axviewer/CMakeLists.txt9
-rw-r--r--tests/manual/dumpcpp/CMakeLists.txt13
-rw-r--r--tests/manual/testcontrol/CMakeLists.txt8
4 files changed, 4 insertions, 28 deletions
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"