diff options
author | Luca Di Sera <luca.disera@qt.io> | 2023-05-10 16:29:48 +0200 |
---|---|---|
committer | Luca Di Sera <luca.disera@qt.io> | 2023-05-11 11:17:21 +0200 |
commit | 453fa4ca39c93f31d496d856babda17b919d6cec (patch) | |
tree | 460662fc03e25a23d401d65bb8e225e03c453289 /tests/auto/qdoc/qdoc/boundaries/filesystem/catch_filepath.cpp | |
parent | d927a87b765681dc7fb1bf2ba81a113000141d7b (diff) | |
download | qttools-453fa4ca39c93f31d496d856babda17b919d6cec.tar.gz |
QDoc: Move catch_conversions under src
QDoc employs a very small support library, "catch_conversions", to
provide better output for certain types when used with the Catch2
testing framework, which QDoc uses for some of its tests.
"catch_conversions" was currently kept under "tests/auto/qdoc" and its
headers were included and used directly by its sibling tests by relative
paths.
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 "catch_conversions" support library is now
moved under "src/qdoc".
To allow code that depended on it to keep their usages without requiring
the addition of some relative paths from the "tests" directory to the
"src" directory, a library target, "Qt::QDocCatchConversionsPrivate" was
created for the support library.
The target can be linked-to to gain access to the
previously-directly-used headers, with include path
"catch_conversions/.*".
To allow for this specific include path to work, the internal directory
structure for "catch_conversions" was slightly modified with the
addition of some intermediate directories in between its root and the
library headers.
Targets 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::QDocCatchConversionsPrivate" as a library.
The inclusions of the of the "catch_conversions" headers in
relevant sources was modified to respect the new "catch_conversions/.*"
path.
The root "CMakeLists.txt" file under "src/qdoc" was modified to add the
relevant library as a subdirectory.
Change-Id: Iec24ca3877a48a42a55ff406309813aa083ab23f
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Diffstat (limited to 'tests/auto/qdoc/qdoc/boundaries/filesystem/catch_filepath.cpp')
-rw-r--r-- | tests/auto/qdoc/qdoc/boundaries/filesystem/catch_filepath.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qdoc/qdoc/boundaries/filesystem/catch_filepath.cpp b/tests/auto/qdoc/qdoc/boundaries/filesystem/catch_filepath.cpp index 167aafc85..46481e4d6 100644 --- a/tests/auto/qdoc/qdoc/boundaries/filesystem/catch_filepath.cpp +++ b/tests/auto/qdoc/qdoc/boundaries/filesystem/catch_filepath.cpp @@ -1,7 +1,7 @@ // 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 <qdoc_catch_conversions.h> +#include <catch_conversions/qdoc_catch_conversions.h> #include <catch/catch.hpp> |