diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-18 14:35:40 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-18 16:25:40 +0000 |
| commit | 3b673994ea0311616db7022cef859705e25cdfab (patch) | |
| tree | 7e637d7c5df75f121fce53ac8aeb59178e21981c /tests/auto/qdoc | |
| parent | d9a3e03934076aea8852f1c4b142a5ecfeea0297 (diff) | |
CMake: Regenerate projects after mergewip/cmake
Plus additional adjustments.
Change-Id: I0c2341ef6a5557e18df91b753f9e441c5b1a68e2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qdoc')
| -rw-r--r-- | tests/auto/qdoc/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/auto/qdoc/config/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | tests/auto/qdoc/generatedoutput/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/qdoc/qdoccommandlineparser/.prev_CMakeLists.txt | 13 | ||||
| -rw-r--r-- | tests/auto/qdoc/utilities/CMakeLists.txt | 14 |
5 files changed, 45 insertions, 5 deletions
diff --git a/tests/auto/qdoc/CMakeLists.txt b/tests/auto/qdoc/CMakeLists.txt index e9a5da6eb..750ce80d0 100644 --- a/tests/auto/qdoc/CMakeLists.txt +++ b/tests/auto/qdoc/CMakeLists.txt @@ -1,4 +1,5 @@ # Generated from qdoc.pro. +add_subdirectory(config) add_subdirectory(generatedoutput) -add_subdirectory(qdoccommandlineparser) +add_subdirectory(utilities) diff --git a/tests/auto/qdoc/config/CMakeLists.txt b/tests/auto/qdoc/config/CMakeLists.txt new file mode 100644 index 000000000..2d54cc041 --- /dev/null +++ b/tests/auto/qdoc/config/CMakeLists.txt @@ -0,0 +1,16 @@ +# Generated from config.pro. + +##################################################################### +## tst_config Test: +##################################################################### + +qt_add_test(tst_config + SOURCES + ../../../../src/qdoc/config.cpp ../../../../src/qdoc/config.h + ../../../../src/qdoc/location.cpp ../../../../src/qdoc/location.h + ../../../../src/qdoc/loggingcategory.h + ../../../../src/qdoc/qdoccommandlineparser.cpp ../../../../src/qdoc/qdoccommandlineparser.h + tst_config.cpp + INCLUDE_DIRECTORIES + ../../../../src/qdoc +) diff --git a/tests/auto/qdoc/generatedoutput/CMakeLists.txt b/tests/auto/qdoc/generatedoutput/CMakeLists.txt index 1d8da3313..d64432b5f 100644 --- a/tests/auto/qdoc/generatedoutput/CMakeLists.txt +++ b/tests/auto/qdoc/generatedoutput/CMakeLists.txt @@ -8,7 +8,3 @@ qt_add_test(tst_generatedOutput SOURCES tst_generatedoutput.cpp ) -qt_add_docs(tst_generatedOutput - test.qdocconf -) - diff --git a/tests/auto/qdoc/qdoccommandlineparser/.prev_CMakeLists.txt b/tests/auto/qdoc/qdoccommandlineparser/.prev_CMakeLists.txt new file mode 100644 index 000000000..6bf74a90a --- /dev/null +++ b/tests/auto/qdoc/qdoccommandlineparser/.prev_CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from qdoccommandlineparser.pro. + +##################################################################### +## tst_qdoccommandlineparser Test: +##################################################################### + +qt_add_test(tst_qdoccommandlineparser + SOURCES + ../../../../src/qdoc/qdoccommandlineparser.cpp ../../../../src/qdoc/qdoccommandlineparser.h + tst_qdoccommandlineparser.cpp + INCLUDE_DIRECTORIES + ../../../../src/qdoc +) diff --git a/tests/auto/qdoc/utilities/CMakeLists.txt b/tests/auto/qdoc/utilities/CMakeLists.txt new file mode 100644 index 000000000..bd949b84d --- /dev/null +++ b/tests/auto/qdoc/utilities/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from utilities.pro. + +##################################################################### +## tst_utilities Test: +##################################################################### + +qt_add_test(tst_utilities + SOURCES + ../../../../src/qdoc/loggingcategory.h + ../../../../src/qdoc/utilities.cpp ../../../../src/qdoc/utilities.h + tst_utilities.cpp + INCLUDE_DIRECTORIES + ../../../../src/qdoc +) |