diff options
-rw-r--r-- | src/qdoc/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/qdoc/catch_generators/CMakeLists.txt | 14 | ||||
-rw-r--r-- | src/qdoc/catch_generators/src/catch_generators/generators/combinators/cycle_generator.h (renamed from tests/auto/qdoc/catch_generators/src/generators/combinators/cycle_generator.h) | 0 | ||||
-rw-r--r-- | src/qdoc/catch_generators/src/catch_generators/generators/combinators/oneof_generator.h (renamed from tests/auto/qdoc/catch_generators/src/generators/combinators/oneof_generator.h) | 0 | ||||
-rw-r--r-- | src/qdoc/catch_generators/src/catch_generators/generators/k_partition_of_r_generator.h (renamed from tests/auto/qdoc/catch_generators/src/generators/k_partition_of_r_generator.h) | 0 | ||||
-rw-r--r-- | src/qdoc/catch_generators/src/catch_generators/generators/path_generator.h (renamed from tests/auto/qdoc/catch_generators/src/generators/path_generator.h) | 0 | ||||
-rw-r--r-- | src/qdoc/catch_generators/src/catch_generators/generators/qchar_generator.h (renamed from tests/auto/qdoc/catch_generators/src/generators/qchar_generator.h) | 0 | ||||
-rw-r--r-- | src/qdoc/catch_generators/src/catch_generators/generators/qstring_generator.h (renamed from tests/auto/qdoc/catch_generators/src/generators/qstring_generator.h) | 0 | ||||
-rw-r--r-- | src/qdoc/catch_generators/src/catch_generators/namespaces.h (renamed from tests/auto/qdoc/catch_generators/src/namespaces.h) | 3 | ||||
-rw-r--r-- | src/qdoc/catch_generators/src/catch_generators/utilities/semantics/copy_value.h (renamed from tests/auto/qdoc/catch_generators/src/utilities/semantics/copy_value.h) | 0 | ||||
-rw-r--r-- | src/qdoc/catch_generators/src/catch_generators/utilities/semantics/generator_handler.h (renamed from tests/auto/qdoc/catch_generators/src/utilities/semantics/generator_handler.h) | 0 | ||||
-rw-r--r-- | src/qdoc/catch_generators/src/catch_generators/utilities/semantics/move_into_vector.h (renamed from tests/auto/qdoc/catch_generators/src/utilities/semantics/move_into_vector.h) | 0 | ||||
-rw-r--r-- | src/qdoc/catch_generators/src/catch_generators/utilities/statistics/distribution.h (renamed from tests/auto/qdoc/catch_generators/src/utilities/statistics/distribution.h) | 0 | ||||
-rw-r--r-- | src/qdoc/catch_generators/src/catch_generators/utilities/statistics/percentages.h (renamed from tests/auto/qdoc/catch_generators/src/utilities/statistics/percentages.h) | 0 | ||||
-rw-r--r-- | src/qdoc/catch_generators/tests/CMakeLists.txt | 20 | ||||
-rw-r--r-- | src/qdoc/catch_generators/tests/generators/catch_k_partition_of_r_generator.cpp (renamed from tests/auto/qdoc/catch_generators/tests/generators/catch_k_partition_of_r_generator.cpp) | 4 | ||||
-rw-r--r-- | src/qdoc/catch_generators/tests/generators/catch_path_generator.cpp (renamed from tests/auto/qdoc/catch_generators/tests/generators/catch_path_generator.cpp) | 16 | ||||
-rw-r--r-- | src/qdoc/catch_generators/tests/generators/catch_qchar_generator.cpp (renamed from tests/auto/qdoc/catch_generators/tests/generators/catch_qchar_generator.cpp) | 4 | ||||
-rw-r--r-- | src/qdoc/catch_generators/tests/generators/catch_qstring_generator.cpp (renamed from tests/auto/qdoc/catch_generators/tests/generators/catch_qstring_generator.cpp) | 6 | ||||
-rw-r--r-- | src/qdoc/catch_generators/tests/generators/combinators/catch_cycle_generator.cpp (renamed from tests/auto/qdoc/catch_generators/tests/generators/combinators/catch_cycle_generator.cpp) | 4 | ||||
-rw-r--r-- | src/qdoc/catch_generators/tests/generators/combinators/catch_oneof_generator.cpp (renamed from tests/auto/qdoc/catch_generators/tests/generators/combinators/catch_oneof_generator.cpp) | 14 | ||||
-rw-r--r-- | src/qdoc/catch_generators/tests/main.cpp (renamed from tests/auto/qdoc/catch_generators/tests/main.cpp) | 6 | ||||
-rw-r--r-- | src/qdoc/catch_generators/tests/utilities/semantics/catch_generator_handler.cpp (renamed from tests/auto/qdoc/catch_generators/tests/utilities/semantics/catch_generator_handler.cpp) | 4 | ||||
-rw-r--r-- | tests/auto/qdoc/CMakeLists.txt | 6 | ||||
-rw-r--r-- | tests/auto/qdoc/catch_generators/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/qdoc/catch_generators/qdoc_catch_generators.h | 5 | ||||
-rw-r--r-- | tests/auto/qdoc/catch_generators/tests/CMakeLists.txt | 21 | ||||
-rw-r--r-- | tests/auto/qdoc/qdoc/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/qdoc/qdoc/boundaries/filesystem/catch_directorypath.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qdoc/qdoc/boundaries/filesystem/catch_filepath.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qdoc/qdoc/filesystem/catch_fileresolver.cpp | 2 |
31 files changed, 78 insertions, 59 deletions
diff --git a/src/qdoc/CMakeLists.txt b/src/qdoc/CMakeLists.txt index 11f947e01..bf3355298 100644 --- a/src/qdoc/CMakeLists.txt +++ b/src/qdoc/CMakeLists.txt @@ -3,6 +3,7 @@ add_subdirectory(catch) add_subdirectory(catch_conversions) +add_subdirectory(catch_generators) if(QT_FEATURE_qdoc AND QT_FEATURE_clangcpp) add_subdirectory(qdoc) diff --git a/src/qdoc/catch_generators/CMakeLists.txt b/src/qdoc/catch_generators/CMakeLists.txt new file mode 100644 index 000000000..aca48734e --- /dev/null +++ b/src/qdoc/catch_generators/CMakeLists.txt @@ -0,0 +1,14 @@ +qt_internal_add_module(QDocCatchGeneratorsPrivate + HEADER_MODULE + EXTERNAL_HEADERS_DIR src +) + +qt_internal_extend_target(QDocCatchGeneratorsPrivate + PUBLIC_INCLUDE_DIRECTORIES + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src> + $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/QtQDocCatchGeneratorsPrivate> +) + +if(QT_BUILD_TESTS) + add_subdirectory(tests) +endif() diff --git a/tests/auto/qdoc/catch_generators/src/generators/combinators/cycle_generator.h b/src/qdoc/catch_generators/src/catch_generators/generators/combinators/cycle_generator.h index b60600747..b60600747 100644 --- a/tests/auto/qdoc/catch_generators/src/generators/combinators/cycle_generator.h +++ b/src/qdoc/catch_generators/src/catch_generators/generators/combinators/cycle_generator.h diff --git a/tests/auto/qdoc/catch_generators/src/generators/combinators/oneof_generator.h b/src/qdoc/catch_generators/src/catch_generators/generators/combinators/oneof_generator.h index 5de9dcb6c..5de9dcb6c 100644 --- a/tests/auto/qdoc/catch_generators/src/generators/combinators/oneof_generator.h +++ b/src/qdoc/catch_generators/src/catch_generators/generators/combinators/oneof_generator.h diff --git a/tests/auto/qdoc/catch_generators/src/generators/k_partition_of_r_generator.h b/src/qdoc/catch_generators/src/catch_generators/generators/k_partition_of_r_generator.h index 832ee2838..832ee2838 100644 --- a/tests/auto/qdoc/catch_generators/src/generators/k_partition_of_r_generator.h +++ b/src/qdoc/catch_generators/src/catch_generators/generators/k_partition_of_r_generator.h diff --git a/tests/auto/qdoc/catch_generators/src/generators/path_generator.h b/src/qdoc/catch_generators/src/catch_generators/generators/path_generator.h index 875502e49..875502e49 100644 --- a/tests/auto/qdoc/catch_generators/src/generators/path_generator.h +++ b/src/qdoc/catch_generators/src/catch_generators/generators/path_generator.h diff --git a/tests/auto/qdoc/catch_generators/src/generators/qchar_generator.h b/src/qdoc/catch_generators/src/catch_generators/generators/qchar_generator.h index 33efc5ea4..33efc5ea4 100644 --- a/tests/auto/qdoc/catch_generators/src/generators/qchar_generator.h +++ b/src/qdoc/catch_generators/src/catch_generators/generators/qchar_generator.h diff --git a/tests/auto/qdoc/catch_generators/src/generators/qstring_generator.h b/src/qdoc/catch_generators/src/catch_generators/generators/qstring_generator.h index fe854d22f..fe854d22f 100644 --- a/tests/auto/qdoc/catch_generators/src/generators/qstring_generator.h +++ b/src/qdoc/catch_generators/src/catch_generators/generators/qstring_generator.h diff --git a/tests/auto/qdoc/catch_generators/src/namespaces.h b/src/qdoc/catch_generators/src/catch_generators/namespaces.h index 7b954feb0..3c956d44f 100644 --- a/tests/auto/qdoc/catch_generators/src/namespaces.h +++ b/src/qdoc/catch_generators/src/catch_generators/namespaces.h @@ -1,3 +1,6 @@ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + #pragma once #define QDOC_CATCH_GENERATORS_ROOT_NAMESPACE qdoc::catch_generators diff --git a/tests/auto/qdoc/catch_generators/src/utilities/semantics/copy_value.h b/src/qdoc/catch_generators/src/catch_generators/utilities/semantics/copy_value.h index 57798be1a..57798be1a 100644 --- a/tests/auto/qdoc/catch_generators/src/utilities/semantics/copy_value.h +++ b/src/qdoc/catch_generators/src/catch_generators/utilities/semantics/copy_value.h diff --git a/tests/auto/qdoc/catch_generators/src/utilities/semantics/generator_handler.h b/src/qdoc/catch_generators/src/catch_generators/utilities/semantics/generator_handler.h index 328627512..328627512 100644 --- a/tests/auto/qdoc/catch_generators/src/utilities/semantics/generator_handler.h +++ b/src/qdoc/catch_generators/src/catch_generators/utilities/semantics/generator_handler.h diff --git a/tests/auto/qdoc/catch_generators/src/utilities/semantics/move_into_vector.h b/src/qdoc/catch_generators/src/catch_generators/utilities/semantics/move_into_vector.h index 5e780085b..5e780085b 100644 --- a/tests/auto/qdoc/catch_generators/src/utilities/semantics/move_into_vector.h +++ b/src/qdoc/catch_generators/src/catch_generators/utilities/semantics/move_into_vector.h diff --git a/tests/auto/qdoc/catch_generators/src/utilities/statistics/distribution.h b/src/qdoc/catch_generators/src/catch_generators/utilities/statistics/distribution.h index 4374993bf..4374993bf 100644 --- a/tests/auto/qdoc/catch_generators/src/utilities/statistics/distribution.h +++ b/src/qdoc/catch_generators/src/catch_generators/utilities/statistics/distribution.h diff --git a/tests/auto/qdoc/catch_generators/src/utilities/statistics/percentages.h b/src/qdoc/catch_generators/src/catch_generators/utilities/statistics/percentages.h index 2d80a459f..2d80a459f 100644 --- a/tests/auto/qdoc/catch_generators/src/utilities/statistics/percentages.h +++ b/src/qdoc/catch_generators/src/catch_generators/utilities/statistics/percentages.h diff --git a/src/qdoc/catch_generators/tests/CMakeLists.txt b/src/qdoc/catch_generators/tests/CMakeLists.txt new file mode 100644 index 000000000..5a4b8667d --- /dev/null +++ b/src/qdoc/catch_generators/tests/CMakeLists.txt @@ -0,0 +1,20 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +qt_internal_add_test(tst_QDoc_Catch_Generators + SOURCES + ${CMAKE_CURRENT_LIST_DIR}/main.cpp + ${CMAKE_CURRENT_LIST_DIR}/generators/catch_qchar_generator.cpp + ${CMAKE_CURRENT_LIST_DIR}/generators/catch_qstring_generator.cpp + ${CMAKE_CURRENT_LIST_DIR}/generators/catch_k_partition_of_r_generator.cpp + ${CMAKE_CURRENT_LIST_DIR}/generators/catch_path_generator.cpp + + ${CMAKE_CURRENT_LIST_DIR}/generators/combinators/catch_oneof_generator.cpp + ${CMAKE_CURRENT_LIST_DIR}/generators/combinators/catch_cycle_generator.cpp + + ${CMAKE_CURRENT_LIST_DIR}/utilities/semantics/catch_generator_handler.cpp + LIBRARIES + Qt::QDocCatchPrivate + Qt::QDocCatchConversionsPrivate + Qt::QDocCatchGeneratorsPrivate +) diff --git a/tests/auto/qdoc/catch_generators/tests/generators/catch_k_partition_of_r_generator.cpp b/src/qdoc/catch_generators/tests/generators/catch_k_partition_of_r_generator.cpp index 9055c5411..27b79c511 100644 --- a/tests/auto/qdoc/catch_generators/tests/generators/catch_k_partition_of_r_generator.cpp +++ b/src/qdoc/catch_generators/tests/generators/catch_k_partition_of_r_generator.cpp @@ -1,8 +1,8 @@ // Copyright (C) 2022 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#include "namespaces.h" -#include "generators/k_partition_of_r_generator.h" +#include <catch_generators/namespaces.h> +#include <catch_generators/generators/k_partition_of_r_generator.h> #include <catch/catch.hpp> diff --git a/tests/auto/qdoc/catch_generators/tests/generators/catch_path_generator.cpp b/src/qdoc/catch_generators/tests/generators/catch_path_generator.cpp index 968008a56..deb33421b 100644 --- a/tests/auto/qdoc/catch_generators/tests/generators/catch_path_generator.cpp +++ b/src/qdoc/catch_generators/tests/generators/catch_path_generator.cpp @@ -1,14 +1,14 @@ // Copyright (C) 2022 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#include "namespaces.h" -#include "generators/qchar_generator.h" -#include "generators/qstring_generator.h" -#include "generators/path_generator.h" -#include "generators/combinators/cycle_generator.h" -#include "utilities/statistics/percentages.h" -#include "utilities/statistics/distribution.h" -#include "utilities/semantics/copy_value.h" +#include <catch_generators/namespaces.h> +#include <catch_generators/generators/qchar_generator.h> +#include <catch_generators/generators/qstring_generator.h> +#include <catch_generators/generators/path_generator.h> +#include <catch_generators/generators/combinators/cycle_generator.h> +#include <catch_generators/utilities/statistics/percentages.h> +#include <catch_generators/utilities/statistics/distribution.h> +#include <catch_generators/utilities/semantics/copy_value.h> #include <catch_conversions/qt_catch_conversions.h> diff --git a/tests/auto/qdoc/catch_generators/tests/generators/catch_qchar_generator.cpp b/src/qdoc/catch_generators/tests/generators/catch_qchar_generator.cpp index 47ef23364..718da7307 100644 --- a/tests/auto/qdoc/catch_generators/tests/generators/catch_qchar_generator.cpp +++ b/src/qdoc/catch_generators/tests/generators/catch_qchar_generator.cpp @@ -1,8 +1,8 @@ // Copyright (C) 2022 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#include "namespaces.h" -#include "generators/qchar_generator.h" +#include <catch_generators/namespaces.h> +#include <catch_generators/generators/qchar_generator.h> #include <catch_conversions/qt_catch_conversions.h> diff --git a/tests/auto/qdoc/catch_generators/tests/generators/catch_qstring_generator.cpp b/src/qdoc/catch_generators/tests/generators/catch_qstring_generator.cpp index 75d7efcf1..0e92f6900 100644 --- a/tests/auto/qdoc/catch_generators/tests/generators/catch_qstring_generator.cpp +++ b/src/qdoc/catch_generators/tests/generators/catch_qstring_generator.cpp @@ -1,9 +1,9 @@ // Copyright (C) 2022 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#include "namespaces.h" -#include "generators/qchar_generator.h" -#include "generators/qstring_generator.h" +#include <catch_generators/namespaces.h> +#include <catch_generators/generators/qchar_generator.h> +#include <catch_generators/generators/qstring_generator.h> #include <catch_conversions/qt_catch_conversions.h> diff --git a/tests/auto/qdoc/catch_generators/tests/generators/combinators/catch_cycle_generator.cpp b/src/qdoc/catch_generators/tests/generators/combinators/catch_cycle_generator.cpp index 43bae006b..5bf98d73a 100644 --- a/tests/auto/qdoc/catch_generators/tests/generators/combinators/catch_cycle_generator.cpp +++ b/src/qdoc/catch_generators/tests/generators/combinators/catch_cycle_generator.cpp @@ -1,8 +1,8 @@ // Copyright (C) 2022 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#include "namespaces.h" -#include "generators/combinators/cycle_generator.h" +#include <catch_generators/namespaces.h> +#include <catch_generators/generators/combinators/cycle_generator.h> #include <catch/catch.hpp> diff --git a/tests/auto/qdoc/catch_generators/tests/generators/combinators/catch_oneof_generator.cpp b/src/qdoc/catch_generators/tests/generators/combinators/catch_oneof_generator.cpp index 68e990813..4d5666213 100644 --- a/tests/auto/qdoc/catch_generators/tests/generators/combinators/catch_oneof_generator.cpp +++ b/src/qdoc/catch_generators/tests/generators/combinators/catch_oneof_generator.cpp @@ -3,13 +3,13 @@ #include <catch_conversions/std_catch_conversions.h> -#include "namespaces.h" -#include "generators/k_partition_of_r_generator.h" -#include "generators/combinators/oneof_generator.h" -#include "generators/combinators/cycle_generator.h" -#include "utilities/statistics/percentages.h" -#include "utilities/statistics/distribution.h" -#include "utilities/semantics/copy_value.h" +#include <catch_generators/namespaces.h> +#include <catch_generators/generators/k_partition_of_r_generator.h> +#include <catch_generators/generators/combinators/oneof_generator.h> +#include <catch_generators/generators/combinators/cycle_generator.h> +#include <catch_generators/utilities/statistics/percentages.h> +#include <catch_generators/utilities/statistics/distribution.h> +#include <catch_generators/utilities/semantics/copy_value.h> #include <catch/catch.hpp> diff --git a/tests/auto/qdoc/catch_generators/tests/main.cpp b/src/qdoc/catch_generators/tests/main.cpp index cec18afba..48ce73f12 100644 --- a/tests/auto/qdoc/catch_generators/tests/main.cpp +++ b/src/qdoc/catch_generators/tests/main.cpp @@ -1,9 +1,13 @@ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + #define CATCH_CONFIG_RUNNER #include <catch/catch.hpp> // A custom main was provided to avoid linking errors when using minGW // that were appearing in CI. // See https://github.com/catchorg/Catch2/issues/1287 -int main(int argc, char* argv[]) { +int main(int argc, char *argv[]) +{ return Catch::Session().run(argc, argv); } diff --git a/tests/auto/qdoc/catch_generators/tests/utilities/semantics/catch_generator_handler.cpp b/src/qdoc/catch_generators/tests/utilities/semantics/catch_generator_handler.cpp index 913646be5..b99a6515d 100644 --- a/tests/auto/qdoc/catch_generators/tests/utilities/semantics/catch_generator_handler.cpp +++ b/src/qdoc/catch_generators/tests/utilities/semantics/catch_generator_handler.cpp @@ -3,8 +3,8 @@ #include <catch/catch.hpp> -#include "namespaces.h" -#include "utilities/semantics/generator_handler.h" +#include <catch_generators/namespaces.h> +#include <catch_generators/utilities/semantics/generator_handler.h> using namespace QDOC_CATCH_GENERATORS_UTILITIES_ABSOLUTE_NAMESPACE; diff --git a/tests/auto/qdoc/CMakeLists.txt b/tests/auto/qdoc/CMakeLists.txt index a2c3ae274..08e79d8bf 100644 --- a/tests/auto/qdoc/CMakeLists.txt +++ b/tests/auto/qdoc/CMakeLists.txt @@ -6,10 +6,14 @@ if(CMAKE_VERSION VERSION_LESS "3.19" AND MSVC AND QT_FEATURE_debug_and_release) return() endif() +set(QDOC_PROJECT_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../../../src/qdoc/) set(QDOC_SOURCE_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../../../src/qdoc/qdoc/) set(QDOC_INCLUDE_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../../../src/qdoc/qdoc/) -add_subdirectory(catch_generators) +if(QT_BUILD_STANDALONE_TESTS) + include(${QDOC_PROJECT_DIRECTORY}/catch_generators/tests/CMakeLists.txt) +endif() + add_subdirectory(qdoc) add_subdirectory(config) add_subdirectory(generatedoutput) diff --git a/tests/auto/qdoc/catch_generators/CMakeLists.txt b/tests/auto/qdoc/catch_generators/CMakeLists.txt deleted file mode 100644 index 88c051636..000000000 --- a/tests/auto/qdoc/catch_generators/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(tests) diff --git a/tests/auto/qdoc/catch_generators/qdoc_catch_generators.h b/tests/auto/qdoc/catch_generators/qdoc_catch_generators.h deleted file mode 100644 index e99a57ec5..000000000 --- a/tests/auto/qdoc/catch_generators/qdoc_catch_generators.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include "src/generators/qchar_generator.h" -#include "src/generators/qstring_generator.h" -#include "src/generators/path_generator.h" diff --git a/tests/auto/qdoc/catch_generators/tests/CMakeLists.txt b/tests/auto/qdoc/catch_generators/tests/CMakeLists.txt deleted file mode 100644 index 76c366331..000000000 --- a/tests/auto/qdoc/catch_generators/tests/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -qt_internal_add_test(tst_QDoc_Catch_Generators - SOURCES - main.cpp - generators/catch_qchar_generator.cpp - generators/catch_qstring_generator.cpp - generators/catch_k_partition_of_r_generator.cpp - generators/catch_path_generator.cpp - - generators/combinators/catch_oneof_generator.cpp - generators/combinators/catch_cycle_generator.cpp - - utilities/semantics/catch_generator_handler.cpp - INCLUDE_DIRECTORIES - ../src - LIBRARIES - Qt::QDocCatchPrivate - Qt::QDocCatchConversionsPrivate -) diff --git a/tests/auto/qdoc/qdoc/CMakeLists.txt b/tests/auto/qdoc/qdoc/CMakeLists.txt index 925290ecd..7e145ab30 100644 --- a/tests/auto/qdoc/qdoc/CMakeLists.txt +++ b/tests/auto/qdoc/qdoc/CMakeLists.txt @@ -15,8 +15,8 @@ qt_internal_add_test(tst_QDoc ${QDOC_SOURCE_DIRECTORY}/filesystem/fileresolver.cpp INCLUDE_DIRECTORIES ${QDOC_INCLUDE_DIRECTORY} - ../catch_generators/ LIBRARIES Qt::QDocCatchPrivate Qt::QDocCatchConversionsPrivate + Qt::QDocCatchGeneratorsPrivate ) diff --git a/tests/auto/qdoc/qdoc/boundaries/filesystem/catch_directorypath.cpp b/tests/auto/qdoc/qdoc/boundaries/filesystem/catch_directorypath.cpp index 5321e2619..31a45bfa4 100644 --- a/tests/auto/qdoc/qdoc/boundaries/filesystem/catch_directorypath.cpp +++ b/tests/auto/qdoc/qdoc/boundaries/filesystem/catch_directorypath.cpp @@ -7,7 +7,7 @@ #include <boundaries/filesystem/directorypath.h> -#include <qdoc_catch_generators.h> +#include <catch_generators/generators/path_generator.h> #include <QFileInfo> #include <QTemporaryDir> diff --git a/tests/auto/qdoc/qdoc/boundaries/filesystem/catch_filepath.cpp b/tests/auto/qdoc/qdoc/boundaries/filesystem/catch_filepath.cpp index 46481e4d6..957a13127 100644 --- a/tests/auto/qdoc/qdoc/boundaries/filesystem/catch_filepath.cpp +++ b/tests/auto/qdoc/qdoc/boundaries/filesystem/catch_filepath.cpp @@ -7,7 +7,7 @@ #include <boundaries/filesystem/filepath.h> -#include <qdoc_catch_generators.h> +#include <catch_generators/generators/path_generator.h> #include <QFileInfo> #include <QTemporaryDir> diff --git a/tests/auto/qdoc/qdoc/filesystem/catch_fileresolver.cpp b/tests/auto/qdoc/qdoc/filesystem/catch_fileresolver.cpp index fca33debb..75774c9cc 100644 --- a/tests/auto/qdoc/qdoc/filesystem/catch_fileresolver.cpp +++ b/tests/auto/qdoc/qdoc/filesystem/catch_fileresolver.cpp @@ -7,7 +7,7 @@ #include <filesystem/fileresolver.h> -#include <qdoc_catch_generators.h> +#include <catch_generators/generators/path_generator.h> #include <vector> #include <algorithm> |