diff options
| author | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-01-30 12:01:00 +0100 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-01-30 16:14:57 +0000 |
| commit | 7d5978df7c22749cd11ce00bb36042a7decd9ad1 (patch) | |
| tree | 56863554468fd6f0061b1607f4809b63c8ca0f59 /tests | |
| parent | 23b3100c562f2747fd4a2c6ac5ab6ab32a70db4a (diff) | |
cmake: test: Fix qdbusabstractadaptor
Change-Id: Ibe3e64bd68df1f1f46308f6f622822cb9caa99e5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'tests')
4 files changed, 11 insertions, 16 deletions
diff --git a/tests/auto/dbus/CMakeLists.txt b/tests/auto/dbus/CMakeLists.txt index e1e23a7247..996304127b 100644 --- a/tests/auto/dbus/CMakeLists.txt +++ b/tests/auto/dbus/CMakeLists.txt @@ -18,7 +18,7 @@ add_subdirectory(qdbustype) add_subdirectory(qdbusthreading) if(QT_FEATURE_process) - # missing add_qt_binary: add_subdirectory("qdbusabstractadaptor") + add_subdirectory(qdbusabstractadaptor) # missing add_qt_binary: add_subdirectory("qdbusabstractinterface") # missing add_qt_binary: add_subdirectory("qdbusinterface") diff --git a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt index 9a8132d115..08bfb51234 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt +++ b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt @@ -1,4 +1,12 @@ # Generated from qdbusabstractadaptor.pro. add_subdirectory(qmyserver) -add_subdirectory(qdbusabstractadaptor) + +add_qt_test(tst_qdbusabstractadaptor + SOURCES + myobject.h + tst_qdbusabstractadaptor.cpp + LIBRARIES + Qt::CorePrivate + Qt::DBus +) diff --git a/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor/CMakeLists.txt deleted file mode 100644 index 953eeb4fa4..0000000000 --- a/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -# Generated from qdbusabstractadaptor.pro. - -##################################################################### -## ../tst_qdbusabstractadaptor Test: -##################################################################### - -add_qt_test(../tst_qdbusabstractadaptor - SOURCES - ../myobject.h - ../tst_qdbusabstractadaptor.cpp - LIBRARIES - Qt::CorePrivate - Qt::DBus -) diff --git a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt index 627b29ff42..e8d542056c 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt +++ b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt @@ -9,5 +9,6 @@ add_qt_executable(qmyserver ../myobject.h qmyserver.cpp LIBRARIES + Qt::Core Qt::DBus ) |