summaryrefslogtreecommitdiff
path: root/tests/auto/qdoc/catch_generators/src/generators/combinators/cycle_generator.h
diff options
context:
space:
mode:
authorLuca Di Sera <luca.disera@qt.io>2023-05-04 12:34:30 +0200
committerLuca Di Sera <luca.disera@qt.io>2023-05-11 09:17:18 +0000
commitd927a87b765681dc7fb1bf2ba81a113000141d7b (patch)
treeb4589f4017f16aa22b473d81afc287a6bae86675 /tests/auto/qdoc/catch_generators/src/generators/combinators/cycle_generator.h
parentef4b78f0d32aa537ac57c957061691e335a9f110 (diff)
downloadqttools-d927a87b765681dc7fb1bf2ba81a113000141d7b.tar.gz
QDoc: Move the catch dependency under src
QDoc uses the Catch2 testing-framework for some of its tests. The dependency is included as a header-only library that lived under "tests/auto/qdoc/". Due to a certain restructuring that is happening in QDoc, with one of the goals, among others, being to increase the locality of QDoc-related code under "src/qdoc", the Catch2 dependency is now moved under "src/qdoc". To allow tests that depend on it to keep their usages without requiring relative paths from the "tests" directory to the "src" directory, a library target, "Qt::QDocCatchPrivate" was created for the dependency. The target can be linked to to have access to the Catch2 dependency and the Catch2 header can be included with "catch/catch.hpp". To allow for this specific include path to work, the internal directory structure of the Catch2 dependency was slightly modified, adding some additional intermediate directories in between its root and the library header. Tests under "tests/auto/qdoc" that used the dependency now link to it instead. Hence, their "CMakeLists.txt" files were modified to avoid using the dependency as an include directory and instead use "Qt::QDocCatchPrivate" as a library. The relevant inclusion of the Catch2 header in those sources was modified to respect the new "catch/catch.hpp" path. Change-Id: Ifd462f582d197f78a8ffbbbe7b2cf9ae25dbc991 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'tests/auto/qdoc/catch_generators/src/generators/combinators/cycle_generator.h')
-rw-r--r--tests/auto/qdoc/catch_generators/src/generators/combinators/cycle_generator.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qdoc/catch_generators/src/generators/combinators/cycle_generator.h b/tests/auto/qdoc/catch_generators/src/generators/combinators/cycle_generator.h
index 5ad875d76..b60600747 100644
--- a/tests/auto/qdoc/catch_generators/src/generators/combinators/cycle_generator.h
+++ b/tests/auto/qdoc/catch_generators/src/generators/combinators/cycle_generator.h
@@ -6,7 +6,7 @@
#include "../../namespaces.h"
#include "../../utilities/semantics/generator_handler.h"
-#include <catch.hpp>
+#include <catch/catch.hpp>
#include <vector>