diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-12 18:12:15 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-13 10:11:39 +0000 |
commit | 8305b6fe3f612e4b78b072e8bbe9d354c4a969bb (patch) | |
tree | f69f32a206b10a407c813c41df50162deb666958 /tests/auto/dbus | |
parent | 0650bafa59d280e20f3025859b558962aee95257 (diff) |
Regenerate tests/auto/dbus
Change-Id: I105eb73065e02a4fa508d17f481047b32875f128
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/dbus')
26 files changed, 120 insertions, 51 deletions
diff --git a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt new file mode 100644 index 0000000000..caea7b1e64 --- /dev/null +++ b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qmyserver.pro. + +##################################################################### +## qmyserver Binary: +##################################################################### + +add_qt_executable(qmyserver + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + ../myobject.h + qmyserver.cpp + PUBLIC_LIBRARIES + Qt::DBus +) diff --git a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt index 651388be41..839b952591 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt +++ b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt @@ -5,12 +5,11 @@ ##################################################################### add_qt_executable(qmyserver + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" NO_INSTALL # special case - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES ../myobject.h qmyserver.cpp - LIBRARIES - Qt::Core + PUBLIC_LIBRARIES Qt::DBus ) diff --git a/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt new file mode 100644 index 0000000000..4e2b5fe567 --- /dev/null +++ b/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qpinger.pro. + +##################################################################### +## qpinger Binary: +##################################################################### + +add_qt_executable(qpinger + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + ../interface.cpp ../interface.h + qpinger.cpp + PUBLIC_LIBRARIES + Qt::DBus +) diff --git a/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt index 59e69c877b..47e3cfbb69 100644 --- a/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt +++ b/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt @@ -5,12 +5,11 @@ ##################################################################### add_qt_executable(qpinger + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" NO_INSTALL # special case - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES ../interface.cpp ../interface.h qpinger.cpp - LIBRARIES - Qt::Core + PUBLIC_LIBRARIES Qt::DBus ) diff --git a/tests/auto/dbus/qdbusconnection/CMakeLists.txt b/tests/auto/dbus/qdbusconnection/CMakeLists.txt index e2886d9185..b1927e5d10 100644 --- a/tests/auto/dbus/qdbusconnection/CMakeLists.txt +++ b/tests/auto/dbus/qdbusconnection/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qdbusconnection SOURCES tst_qdbusconnection.cpp tst_qdbusconnection.h - LIBRARIES + PUBLIC_LIBRARIES Qt::DBus ) diff --git a/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt index 8463fea971..0602c67fbb 100644 --- a/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt +++ b/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt @@ -8,7 +8,7 @@ add_qt_test(tst_qdbusconnection_delayed SOURCES tst_qdbusconnection_delayed.cpp DEFINES - SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" - LIBRARIES + SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" + PUBLIC_LIBRARIES Qt::DBus ) diff --git a/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt index 07223682cf..061c59579d 100644 --- a/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt +++ b/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt @@ -9,8 +9,8 @@ add_qt_test(tst_qdbusconnection_no_app ../qdbusconnection/tst_qdbusconnection.h tst_qdbusconnection_no_app.cpp DEFINES - SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" + SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" tst_QDBusConnection=tst_QDBusConnection_NoApplication - LIBRARIES + PUBLIC_LIBRARIES Qt::DBus ) diff --git a/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt index 8cd1e2a3d3..b05ac03b2d 100644 --- a/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt +++ b/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qdbusconnection_no_bus SOURCES tst_qdbusconnection_no_bus.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::DBus ) diff --git a/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt index 08a5c3cad5..c372f16d12 100644 --- a/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt +++ b/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt @@ -10,6 +10,6 @@ add_qt_test(tst_qdbusconnection_no_libdbus DEFINES SIMULATE_LOAD_FAIL tst_QDBusConnectionNoBus=tst_QDBusConnectionNoLibDBus1 - LIBRARIES + PUBLIC_LIBRARIES Qt::DBus ) diff --git a/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt index e7c6cf0ea2..0005c36c36 100644 --- a/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt +++ b/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt @@ -9,9 +9,8 @@ add_qt_test(tst_qdbusconnection_spyhook ../qdbusconnection/tst_qdbusconnection.h tst_qdbusconnection_spyhook.cpp DEFINES - SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" + SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" tst_QDBusConnection=tst_QDBusConnection_SpyHook - LIBRARIES + PUBLIC_LIBRARIES Qt::DBus - RUN_SERIAL ) diff --git a/tests/auto/dbus/qdbuscontext/CMakeLists.txt b/tests/auto/dbus/qdbuscontext/CMakeLists.txt index e5ecc293e5..d8adf50bd2 100644 --- a/tests/auto/dbus/qdbuscontext/CMakeLists.txt +++ b/tests/auto/dbus/qdbuscontext/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qdbuscontext SOURCES tst_qdbuscontext.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::DBus ) diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt new file mode 100644 index 0000000000..caea7b1e64 --- /dev/null +++ b/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qmyserver.pro. + +##################################################################### +## qmyserver Binary: +##################################################################### + +add_qt_executable(qmyserver + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + ../myobject.h + qmyserver.cpp + PUBLIC_LIBRARIES + Qt::DBus +) diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt index fdbe587785..1418f43828 100644 --- a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt +++ b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt @@ -7,13 +7,12 @@ # 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 +add_qt_executable(qmyserver_qdbusinterface # special case + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" NO_INSTALL # special case - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES ../myobject.h qmyserver.cpp - LIBRARIES - Qt::Core + PUBLIC_LIBRARIES Qt::DBus ) diff --git a/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt b/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt index fee5d38372..c65b48f948 100644 --- a/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt +++ b/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qdbuslocalcalls SOURCES tst_qdbuslocalcalls.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::DBus ) diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt new file mode 100644 index 0000000000..783607f615 --- /dev/null +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt @@ -0,0 +1,31 @@ +# Generated from qdbusmarshall.pro. + +##################################################################### +## tst_qdbusmarshall Test: +##################################################################### + +add_qt_test(tst_qdbusmarshall + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + ../tst_qdbusmarshall.cpp + LIBRARIES + Qt::CorePrivate + Qt::DBusPrivate + PUBLIC_LIBRARIES + Qt::DBus +) + +## Scopes: +##################################################################### + +extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked + DEFINES + QT_LINKED_LIBDBUS + PUBLIC_LIBRARIES + dbus-1 +) + +extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked + SOURCES + ../../../../../src/dbus/qdbus_symbols.cpp +) diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt index 337ae47ee9..6bb05cafb9 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt @@ -1,33 +1,33 @@ # Generated from qdbusmarshall.pro. ##################################################################### -## ../tst_qdbusmarshall Test: +## tst_qdbusmarshall Test: ##################################################################### add_qt_test(tst_qdbusmarshall + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../tst_qdbusmarshall.cpp LIBRARIES Qt::CorePrivate Qt::DBusPrivate + PUBLIC_LIBRARIES + Qt::DBus ) ## Scopes: ##################################################################### -extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked - DEFINES - QT_LINKED_LIBDBUS -) - # special case begin # This test case interacts with dbus code directly via the private # headers. The include path is also not exposed via Qt:DBus. +# special case end extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked - LIBRARIES + DEFINES + QT_LINKED_LIBDBUS + PUBLIC_LIBRARIES dbus-1 ) -# special case end extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked SOURCES diff --git a/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt index be61e0d4b6..e53c11aabe 100644 --- a/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt +++ b/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### add_qt_executable(qpong - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES qpong.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt b/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt index 661339c4fe..1ffd6944d1 100644 --- a/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt +++ b/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt @@ -9,4 +9,6 @@ add_qt_test(tst_qdbusmetaobject tst_qdbusmetaobject.cpp LIBRARIES Qt::DBusPrivate + PUBLIC_LIBRARIES + Qt::DBus ) diff --git a/tests/auto/dbus/qdbusmetatype/CMakeLists.txt b/tests/auto/dbus/qdbusmetatype/CMakeLists.txt index cde3362ed8..1bc7871f8c 100644 --- a/tests/auto/dbus/qdbusmetatype/CMakeLists.txt +++ b/tests/auto/dbus/qdbusmetatype/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qdbusmetatype SOURCES tst_qdbusmetatype.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::DBus ) diff --git a/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt b/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt index 86f981221a..d432fd3f6c 100644 --- a/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt +++ b/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qdbuspendingcall SOURCES tst_qdbuspendingcall.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::DBus ) diff --git a/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt b/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt index 82224c20d6..f6ff6afe8c 100644 --- a/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt +++ b/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qdbuspendingreply SOURCES tst_qdbuspendingreply.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::DBus ) diff --git a/tests/auto/dbus/qdbusreply/CMakeLists.txt b/tests/auto/dbus/qdbusreply/CMakeLists.txt index 283be755f6..11770e16d5 100644 --- a/tests/auto/dbus/qdbusreply/CMakeLists.txt +++ b/tests/auto/dbus/qdbusreply/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qdbusreply SOURCES tst_qdbusreply.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::DBus ) diff --git a/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt b/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt index fe1c3c7911..436629ab80 100644 --- a/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt +++ b/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qdbusservicewatcher SOURCES tst_qdbusservicewatcher.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::DBus ) diff --git a/tests/auto/dbus/qdbusthreading/CMakeLists.txt b/tests/auto/dbus/qdbusthreading/CMakeLists.txt index 7cab309dbf..1c8f8a6053 100644 --- a/tests/auto/dbus/qdbusthreading/CMakeLists.txt +++ b/tests/auto/dbus/qdbusthreading/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qdbusthreading SOURCES tst_qdbusthreading.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::DBus ) diff --git a/tests/auto/dbus/qdbustype/CMakeLists.txt b/tests/auto/dbus/qdbustype/CMakeLists.txt index fc0c014a07..37ba25e017 100644 --- a/tests/auto/dbus/qdbustype/CMakeLists.txt +++ b/tests/auto/dbus/qdbustype/CMakeLists.txt @@ -11,24 +11,20 @@ add_qt_test(tst_qdbustype Qt::CorePrivate Qt::DBusPrivate PUBLIC_LIBRARIES - Qt::Core Qt::DBus ) -#### Keys ignored in scope 1:.:.:qdbustype.pro:<TRUE>: -# CONFIG = "testcase" "parallel_test" - ## Scopes: ##################################################################### - extend_target(tst_qdbustype CONDITION QT_FEATURE_dbus_linked - DEFINES - QT_LINKED_LIBDBUS - LIBRARIES - dbus-1 - ) +extend_target(tst_qdbustype CONDITION QT_FEATURE_dbus_linked + DEFINES + QT_LINKED_LIBDBUS + PUBLIC_LIBRARIES + dbus-1 +) - extend_target(tst_qdbustype CONDITION NOT QT_FEATURE_dbus_linked - SOURCES - ../../../../src/dbus/qdbus_symbols.cpp - ) +extend_target(tst_qdbustype CONDITION NOT QT_FEATURE_dbus_linked + SOURCES + ../../../../src/dbus/qdbus_symbols.cpp +) diff --git a/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt b/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt index ab35fba048..71b223bdc6 100644 --- a/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt +++ b/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt @@ -10,5 +10,7 @@ add_qt_test(tst_qdbusxmlparser LIBRARIES Qt::CorePrivate Qt::DBusPrivate + PUBLIC_LIBRARIES + Qt::DBus Qt::Xml ) |