diff options
author | David Faure <david.faure@kdab.com> | 2020-11-27 16:52:16 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-12-02 20:23:49 +0100 |
commit | ba6f4ea0f997a6f1a77295888cfec975a1a02944 (patch) | |
tree | 56d4c1165c7a5713fe6f3616ff1fbfa85506417c /tests | |
parent | 0110ca6ffb12d610b88fc117d924cf9b09c2c0fc (diff) |
qtx11extras: add CMake build system
The coin subdir comes from qtsvg.
The dependencies.yaml was inspired by the one in qttools.
Change-Id: I3ba6f29641f5e27085920641693ab499184ed8fe
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/.prev_CMakeLists.txt | 7 | ||||
-rw-r--r-- | tests/CMakeLists.txt | 12 | ||||
-rw-r--r-- | tests/auto/.prev_CMakeLists.txt | 6 | ||||
-rw-r--r-- | tests/auto/CMakeLists.txt | 6 | ||||
-rw-r--r-- | tests/auto/qx11info/.prev_CMakeLists.txt | 15 | ||||
-rw-r--r-- | tests/auto/qx11info/CMakeLists.txt | 15 | ||||
-rw-r--r-- | tests/auto/qx11info/tst_qx11info.cpp | 2 | ||||
-rw-r--r-- | tests/manual/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tests/manual/peeker/CMakeLists.txt | 17 |
9 files changed, 82 insertions, 1 deletions
diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt new file mode 100644 index 0000000..2214137 --- /dev/null +++ b/tests/.prev_CMakeLists.txt @@ -0,0 +1,7 @@ +# 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. +endif() +qt_build_tests() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100644 index 0000000..bad475b --- /dev/null +++ b/tests/CMakeLists.txt @@ -0,0 +1,12 @@ +# 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. + # special case begin + if(NOT TARGET XCB::XCB) + qt_find_package(XCB REQUIRED PROVIDED_TARGETS XCB::XCB) + endif() + # special case end +endif() +qt_build_tests() diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt new file mode 100644 index 0000000..b694a81 --- /dev/null +++ b/tests/auto/.prev_CMakeLists.txt @@ -0,0 +1,6 @@ +# Generated from auto.pro. + +add_subdirectory(cmake) +if(TARGET Qt::Widgets) + add_subdirectory(qx11info) +endif() diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt new file mode 100644 index 0000000..e581e78 --- /dev/null +++ b/tests/auto/CMakeLists.txt @@ -0,0 +1,6 @@ +# Generated from auto.pro. + +# add_subdirectory(cmake) # special case remove +if(TARGET Qt::Widgets) + add_subdirectory(qx11info) +endif() diff --git a/tests/auto/qx11info/.prev_CMakeLists.txt b/tests/auto/qx11info/.prev_CMakeLists.txt new file mode 100644 index 0000000..0e60be4 --- /dev/null +++ b/tests/auto/qx11info/.prev_CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from qx11info.pro. + +##################################################################### +## tst_qx11info Test: +##################################################################### + +qt_internal_add_test(tst_qx11info + SOURCES + tst_qx11info.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + Qt::X11Extras + XCB::XCB +) diff --git a/tests/auto/qx11info/CMakeLists.txt b/tests/auto/qx11info/CMakeLists.txt new file mode 100644 index 0000000..0e60be4 --- /dev/null +++ b/tests/auto/qx11info/CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from qx11info.pro. + +##################################################################### +## tst_qx11info Test: +##################################################################### + +qt_internal_add_test(tst_qx11info + SOURCES + tst_qx11info.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + Qt::X11Extras + XCB::XCB +) diff --git a/tests/auto/qx11info/tst_qx11info.cpp b/tests/auto/qx11info/tst_qx11info.cpp index e997832..b4207c1 100644 --- a/tests/auto/qx11info/tst_qx11info.cpp +++ b/tests/auto/qx11info/tst_qx11info.cpp @@ -244,7 +244,7 @@ protected: return false; } - void exposeEvent(QExposeEvent *) + void exposeEvent(QExposeEvent *) override { if (m_ignoreSubsequentExpose) return; diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt new file mode 100644 index 0000000..98adde5 --- /dev/null +++ b/tests/manual/CMakeLists.txt @@ -0,0 +1,3 @@ +# Generated from manual.pro. + +add_subdirectory(peeker) diff --git a/tests/manual/peeker/CMakeLists.txt b/tests/manual/peeker/CMakeLists.txt new file mode 100644 index 0000000..555c636 --- /dev/null +++ b/tests/manual/peeker/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from peeker.pro. + +##################################################################### +## peeker Binary: +##################################################################### + +qt_internal_add_manual_test(peeker + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::X11Extras +) + +#### Keys ignored in scope 1:.:.:peeker.pro:<TRUE>: +# TEMPLATE = "app" |