diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-14 15:24:54 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 08:16:17 +0000 |
| commit | 7c6f763d85c16bb1f3ee1ec8d845696188bef067 (patch) | |
| tree | f9c09f63fbffef9ca6cc46d03a0358102e06b942 /tests/auto/dbus | |
| parent | 89d4f2f13e9bcd9ae40ad51fe043b2838b46e26e (diff) | |
Regenerate Tests
Change-Id: I78f1efbec809610bcf6a8224392fa0dc8dbf3b3b
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'tests/auto/dbus')
6 files changed, 25 insertions, 9 deletions
diff --git a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt new file mode 100644 index 0000000000..83d9899b36 --- /dev/null +++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from qdbusabstractinterface.pro. + +##################################################################### +## tst_qdbusabstractinterface Test: +##################################################################### + +add_qt_test(tst_qdbusabstractinterface + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + ../interface.cpp ../interface.h + ../tst_qdbusabstractinterface.cpp + DBUS_INTERFACE_SOURCES + ../org.qtproject.QtDBus.Pinger.xml + DBUS_INTERFACE_FLAGS + "-i" "../interface.h" + PUBLIC_LIBRARIES + Qt::DBus +) diff --git a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/CMakeLists.txt index d79bfa0c2d..3df1ff8177 100644 --- a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/CMakeLists.txt +++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/CMakeLists.txt @@ -3,7 +3,6 @@ ##################################################################### ## tst_qdbusabstractinterface Test: ##################################################################### - # special case begin # this test can not be generated here. It needs to be set up in the # parent directory diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt index caea7b1e64..671403999b 100644 --- a/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt +++ b/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt @@ -1,10 +1,10 @@ # Generated from qmyserver.pro. ##################################################################### -## qmyserver Binary: +## qmyserver_qdbusinterface Binary: ##################################################################### -add_qt_executable(qmyserver +add_qt_executable(qmyserver_qdbusinterface OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../myobject.h diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt index 1418f43828..de633f2aa9 100644 --- a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt +++ b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt @@ -1,13 +1,10 @@ # Generated from qmyserver.pro. ##################################################################### -## qmyserver Binary: +## qmyserver_qdbusinterface Binary: ##################################################################### -# Can't be called qmyserver since the qdbusabstractadaptor test -# already has a executable target named like that, so use -# a different target name and then rename the binary -add_qt_executable(qmyserver_qdbusinterface # special case +add_qt_executable(qmyserver_qdbusinterface OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" NO_INSTALL # special case SOURCES diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt index 783607f615..6f8a6804e1 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### add_qt_test(tst_qdbusmarshall + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../tst_qdbusmarshall.cpp diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt index d78505a53d..84976ee923 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### add_qt_test(tst_qdbusmarshall - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qdbusmarshall.cpp LIBRARIES |