diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-08 14:04:17 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-08 22:49:41 +0100 |
commit | 1e0539ea51b75d9404ccc9506fcc0cdfa6951307 (patch) | |
tree | b9033bc13a4f4611cf430a92236e9b93c460904e /tests | |
parent | 1f859ca1ac6d337aedde2fe8eed74266416ae0d1 (diff) | |
download | qttools-1e0539ea51b75d9404ccc9506fcc0cdfa6951307.tar.gz |
Remove remains of qmake conversion from CMakeLists.txt files
Pick-to: 6.5
Change-Id: Ic00df7d45246270d724b3b1d1ef9d13d76dcc136
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests')
21 files changed, 1 insertions, 53 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 800bc265b..05cc44c74 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 5a2e0ca1a..54326bd8b 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. - if(QT_FEATURE_process AND NOT CMAKE_CROSSCOMPILING) add_subdirectory(linguist) add_subdirectory(qtattributionsscanner) @@ -18,9 +16,3 @@ if(TARGET Qt::Help AND NOT CMAKE_CROSSCOMPILING) add_subdirectory(qhelpindexmodel) add_subdirectory(qhelpprojectdata) endif() -# special case begin -# add_subdirectory(cmake) -# if (TARGET Qt::Linguist) -# add_subdirectory(cmake/linguist) -# endif() -# special case end diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 02f54ce52..b3af8f2c2 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# special case skip regeneration - # This is an automatic test for the CMake configuration files. # To run it manually, # 1) mkdir build # Create a build directory diff --git a/tests/auto/linguist/CMakeLists.txt b/tests/auto/linguist/CMakeLists.txt index 85e2da5c4..a651fd3ec 100644 --- a/tests/auto/linguist/CMakeLists.txt +++ b/tests/auto/linguist/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from linguist.pro. - add_subdirectory(lrelease) add_subdirectory(lconvert) add_subdirectory(lupdate) diff --git a/tests/auto/linguist/lconvert/CMakeLists.txt b/tests/auto/linguist/lconvert/CMakeLists.txt index 09892ee57..91d658eb4 100644 --- a/tests/auto/linguist/lconvert/CMakeLists.txt +++ b/tests/auto/linguist/lconvert/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from lconvert.pro. - ##################################################################### ## tst_lconvert Test: ##################################################################### diff --git a/tests/auto/linguist/lrelease/CMakeLists.txt b/tests/auto/linguist/lrelease/CMakeLists.txt index a286a5fce..4ba7a6c86 100644 --- a/tests/auto/linguist/lrelease/CMakeLists.txt +++ b/tests/auto/linguist/lrelease/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from lrelease.pro. - ##################################################################### ## tst_lrelease Test: ##################################################################### diff --git a/tests/auto/linguist/lupdate/CMakeLists.txt b/tests/auto/linguist/lupdate/CMakeLists.txt index a03076603..3501bb43c 100644 --- a/tests/auto/linguist/lupdate/CMakeLists.txt +++ b/tests/auto/linguist/lupdate/CMakeLists.txt @@ -1,14 +1,10 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from lupdate.pro. - -# special case begin if(CMAKE_VERSION VERSION_LESS "3.19" AND MSVC AND QT_FEATURE_debug_and_release) message(WARNING "tst_lupdate will not be built in this configuration.") return() endif() -# special case end ##################################################################### ## tst_lupdate Test: diff --git a/tests/auto/qdoc/CMakeLists.txt b/tests/auto/qdoc/CMakeLists.txt index 6af8627f1..a75fdcaf3 100644 --- a/tests/auto/qdoc/CMakeLists.txt +++ b/tests/auto/qdoc/CMakeLists.txt @@ -1,14 +1,10 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qdoc.pro. - -# special case begin if(CMAKE_VERSION VERSION_LESS "3.19" AND MSVC AND QT_FEATURE_debug_and_release) message(WARNING "qdoc tests will not be built in this configuration.") return() endif() -# special case end add_subdirectory(catch_generators) add_subdirectory(qdoc) diff --git a/tests/auto/qdoc/config/CMakeLists.txt b/tests/auto/qdoc/config/CMakeLists.txt index d384ded14..9836fb1f0 100644 --- a/tests/auto/qdoc/config/CMakeLists.txt +++ b/tests/auto/qdoc/config/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from config.pro. - ##################################################################### ## tst_config Test: ##################################################################### diff --git a/tests/auto/qdoc/generatedoutput/CMakeLists.txt b/tests/auto/qdoc/generatedoutput/CMakeLists.txt index a98d64a7b..4a50e2e50 100644 --- a/tests/auto/qdoc/generatedoutput/CMakeLists.txt +++ b/tests/auto/qdoc/generatedoutput/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from generatedoutput.pro. -# special case skip regeneration # It's mostly manually written. ##################################################################### diff --git a/tests/auto/qdoc/qdoccommandlineparser/CMakeLists.txt b/tests/auto/qdoc/qdoccommandlineparser/CMakeLists.txt index ef872534e..1ebe4f3e2 100644 --- a/tests/auto/qdoc/qdoccommandlineparser/CMakeLists.txt +++ b/tests/auto/qdoc/qdoccommandlineparser/CMakeLists.txt @@ -1,14 +1,13 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qdoccommandlineparser.pro. ##################################################################### ## tst_qdoccommandlineparser Test: ##################################################################### qt_internal_add_test(tst_qdoccommandlineparser - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" # special case + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" SOURCES ../../../../src/qdoc/qdoccommandlineparser.cpp ../../../../src/qdoc/qdoccommandlineparser.h ../../../../src/qdoc/utilities.cpp ../../../../src/qdoc/utilities.h diff --git a/tests/auto/qdoc/utilities/CMakeLists.txt b/tests/auto/qdoc/utilities/CMakeLists.txt index 8d5357282..17615e1a6 100644 --- a/tests/auto/qdoc/utilities/CMakeLists.txt +++ b/tests/auto/qdoc/utilities/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from utilities.pro. - ##################################################################### ## tst_utilities Test: ##################################################################### diff --git a/tests/auto/qhelpcontentmodel/CMakeLists.txt b/tests/auto/qhelpcontentmodel/CMakeLists.txt index 977920e87..a176f4a0f 100644 --- a/tests/auto/qhelpcontentmodel/CMakeLists.txt +++ b/tests/auto/qhelpcontentmodel/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qhelpcontentmodel.pro. - ##################################################################### ## tst_qhelpcontentmodel Test: ##################################################################### diff --git a/tests/auto/qhelpenginecore/CMakeLists.txt b/tests/auto/qhelpenginecore/CMakeLists.txt index 370ecaba5..66b27f0f6 100644 --- a/tests/auto/qhelpenginecore/CMakeLists.txt +++ b/tests/auto/qhelpenginecore/CMakeLists.txt @@ -1,7 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qhelpenginecore.pro. ##################################################################### ## tst_qhelpenginecore Test: diff --git a/tests/auto/qhelpgenerator/CMakeLists.txt b/tests/auto/qhelpgenerator/CMakeLists.txt index 53047fa3a..624d9fe4e 100644 --- a/tests/auto/qhelpgenerator/CMakeLists.txt +++ b/tests/auto/qhelpgenerator/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qhelpgenerator.pro. - ##################################################################### ## tst_qhelpgenerator Test: ##################################################################### diff --git a/tests/auto/qhelpindexmodel/CMakeLists.txt b/tests/auto/qhelpindexmodel/CMakeLists.txt index 291e73b10..b3dd60f26 100644 --- a/tests/auto/qhelpindexmodel/CMakeLists.txt +++ b/tests/auto/qhelpindexmodel/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qhelpindexmodel.pro. - ##################################################################### ## tst_qhelpindexmodel Test: ##################################################################### diff --git a/tests/auto/qhelpprojectdata/CMakeLists.txt b/tests/auto/qhelpprojectdata/CMakeLists.txt index 7544d8800..50607c5fe 100644 --- a/tests/auto/qhelpprojectdata/CMakeLists.txt +++ b/tests/auto/qhelpprojectdata/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qhelpprojectdata.pro. - ##################################################################### ## tst_qhelpprojectdata Test: ##################################################################### diff --git a/tests/auto/qtattributionsscanner/CMakeLists.txt b/tests/auto/qtattributionsscanner/CMakeLists.txt index 7e516a93b..0b93f14d3 100644 --- a/tests/auto/qtattributionsscanner/CMakeLists.txt +++ b/tests/auto/qtattributionsscanner/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qtattributionsscanner.pro. - ##################################################################### ## tst_qtattributionsscanner Test: ##################################################################### @@ -15,6 +13,3 @@ qt_internal_add_test(tst_qtattributionsscanner target_compile_definitions(tst_qtattributionsscanner PRIVATE QTTOOLS_LICENSES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../../../LICENSES" ) - -#### Keys ignored in scope 1:.:.:qtattributionsscanner.pro:<TRUE>: -# DISTFILES = "testdata/good/expected.json" "testdata/good/expected.error" "testdata/good/minimal/qt_attribution_test.json" "testdata/good/minimal/expected.json" "testdata/good/minimal/expected.error" "testdata/good/complete/qt_attribution_test.json" "testdata/good/complete/expected.json" "testdata/good/complete/expected.error" "testdata/good/variants/qt_attribution_test.json" "testdata/good/variants/expected.json" "testdata/good/variants/expected.error" "testdata/warnings/incomplete/qt_attribution_test.json" "testdata/warnings/incomplete/expected.json" "testdata/warnings/incomplete/expected.error" "testdata/warnings/unknown/qt_attribution_test.json" "testdata/warnings/unknown/expected.json" "testdata/warnings/unknown/expected.error" diff --git a/tests/auto/qtdiag/CMakeLists.txt b/tests/auto/qtdiag/CMakeLists.txt index 8ed99e960..054a16395 100644 --- a/tests/auto/qtdiag/CMakeLists.txt +++ b/tests/auto/qtdiag/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qtdiag.pro. - ##################################################################### ## tst_tdiag Test: ##################################################################### diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt index bd7cd4900..278ae6fdb 100644 --- a/tests/manual/CMakeLists.txt +++ b/tests/manual/CMakeLists.txt @@ -1,6 +1,4 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from manual.pro. - add_subdirectory(qtattributionsscanner) diff --git a/tests/manual/qtattributionsscanner/CMakeLists.txt b/tests/manual/qtattributionsscanner/CMakeLists.txt index 878f96a6d..8b1378917 100644 --- a/tests/manual/qtattributionsscanner/CMakeLists.txt +++ b/tests/manual/qtattributionsscanner/CMakeLists.txt @@ -1,2 +1 @@ -# Generated from qtattributionsscanner.pro. |