diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-07 18:34:17 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-09 09:38:39 +0200 |
| commit | db397d11130639abae1b1438b0685db2c75db330 (patch) | |
| tree | a97939cbefc3779e8a3e1ff339ad37f17806a8d7 /tests/auto/dbus | |
| parent | e9a328bc0e56b429a370b13c8e0b4790916cebde (diff) | |
CMake: Regenerate subdir test projects
And generate a few more test projects that were missing.
Change-Id: I5df51106549aa5ae09bc3c42360e14b143719547
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto/dbus')
7 files changed, 22 insertions, 4 deletions
diff --git a/tests/auto/dbus/qdbusabstractadaptor/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/.prev_CMakeLists.txt new file mode 100644 index 0000000000..9a8132d115 --- /dev/null +++ b/tests/auto/dbus/qdbusabstractadaptor/.prev_CMakeLists.txt @@ -0,0 +1,4 @@ +# Generated from qdbusabstractadaptor.pro. + +add_subdirectory(qmyserver) +add_subdirectory(qdbusabstractadaptor) diff --git a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt index a97accb925..0f6d732b09 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt +++ b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt @@ -1,9 +1,9 @@ - # Generated from qdbusabstractadaptor.pro. add_subdirectory(qmyserver) -add_qt_test(tst_qdbusabstractadaptor +# special case begin +qt_add_test(tst_qdbusabstractadaptor SOURCES myobject.h tst_qdbusabstractadaptor.cpp @@ -11,4 +11,4 @@ add_qt_test(tst_qdbusabstractadaptor Qt::CorePrivate Qt::DBus ) - +# special case end diff --git a/tests/auto/dbus/qdbusabstractinterface/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/.prev_CMakeLists.txt new file mode 100644 index 0000000000..111012aba9 --- /dev/null +++ b/tests/auto/dbus/qdbusabstractinterface/.prev_CMakeLists.txt @@ -0,0 +1,4 @@ +# Generated from qdbusabstractinterface.pro. + +add_subdirectory(qpinger) +add_subdirectory(qdbusabstractinterface) diff --git a/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt index 55592832c1..ec49268777 100644 --- a/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt +++ b/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt @@ -2,6 +2,7 @@ add_subdirectory(qpinger) +# special case begin qt_add_test(tst_qdbusabstractinterface SOURCES interface.cpp @@ -19,3 +20,5 @@ qt_extend_target(tst_qdbusabstractinterface DBUS_INTERFACE_FLAGS -i interface.h ) + +# special case end diff --git a/tests/auto/dbus/qdbusinterface/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusinterface/.prev_CMakeLists.txt new file mode 100644 index 0000000000..ae79490a83 --- /dev/null +++ b/tests/auto/dbus/qdbusinterface/.prev_CMakeLists.txt @@ -0,0 +1,4 @@ +# Generated from qdbusinterface.pro. + +add_subdirectory(qmyserver) +add_subdirectory(qdbusinterface) diff --git a/tests/auto/dbus/qdbusinterface/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/CMakeLists.txt index c96944cd56..321c61a627 100644 --- a/tests/auto/dbus/qdbusinterface/CMakeLists.txt +++ b/tests/auto/dbus/qdbusinterface/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from qdbusinterface.pro. -# special case begin add_subdirectory(qmyserver) +# special case begin ##################################################################### ## ../tst_qdbusinterface Test: diff --git a/tests/auto/dbus/qdbusmarshall/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/CMakeLists.txt index aabeae0f4a..5d40035aee 100644 --- a/tests/auto/dbus/qdbusmarshall/CMakeLists.txt +++ b/tests/auto/dbus/qdbusmarshall/CMakeLists.txt @@ -1,4 +1,7 @@ # Generated from qdbusmarshall.pro. +if(NOT QT_FEATURE_private_tests) + return() +endif() add_subdirectory(qpong) add_subdirectory(qdbusmarshall) |