diff options
Diffstat (limited to 'tests/auto/dbus')
33 files changed, 158 insertions, 70 deletions
diff --git a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt index 08bfb51234..a97accb925 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt +++ b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt @@ -1,3 +1,4 @@ + # Generated from qdbusabstractadaptor.pro. add_subdirectory(qmyserver) @@ -10,3 +11,4 @@ add_qt_test(tst_qdbusabstractadaptor Qt::CorePrivate Qt::DBus ) + 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/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp b/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp index fdcd8b07c7..0f266200af 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp +++ b/tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp @@ -737,7 +737,7 @@ void tst_QDBusAbstractAdaptor::sameObjectDifferentPaths() MyObject obj(2); con.registerObject("/p1",&obj); - con.registerObject("/p2",&obj, 0); // don't export anything + con.registerObject("/p2",&obj, { }); // don't export anything QDBusSignalSpy spy; con.connect(con.baseService(), "/p1", "local.Interface2", "signal", &spy, SLOT(slot(QDBusMessage))); @@ -759,7 +759,7 @@ void tst_QDBusAbstractAdaptor::scriptableSignalOrNot() MyObject obj(0); con.registerObject("/p1",&obj, QDBusConnection::ExportScriptableSignals); - con.registerObject("/p2",&obj, 0); // don't export anything + con.registerObject("/p2",&obj, { }); // don't export anything QDBusSignalSpy spy; con.connect(con.baseService(), "/p1", "local.MyObject", "scriptableSignalVoid", &spy, SLOT(slot(QDBusMessage))); @@ -1270,7 +1270,7 @@ void tst_QDBusAbstractAdaptor::sameObjectDifferentPathsPeer() newMyObjectPeer(2); registerMyObjectPeer("/p1"); - registerMyObjectPeer("/p2", 0); // don't export anything + registerMyObjectPeer("/p2", { }); // don't export anything syncPeer(); QDBusSignalSpy spy; @@ -1294,7 +1294,7 @@ void tst_QDBusAbstractAdaptor::scriptableSignalOrNotPeer() newMyObjectPeer(0); registerMyObjectPeer("/p1", QDBusConnection::ExportScriptableSignals); - registerMyObjectPeer("/p2", 0); // don't export anything + registerMyObjectPeer("/p2", { }); // don't export anything syncPeer(); QDBusSignalSpy spy; 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..ee5a7c4003 --- /dev/null +++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from qdbusabstractinterface.pro. + +##################################################################### +## tst_qdbusabstractinterface Test: +##################################################################### + +add_qt_test(tst_qdbusabstractinterface + 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 new file mode 100644 index 0000000000..3df1ff8177 --- /dev/null +++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/CMakeLists.txt @@ -0,0 +1,9 @@ +# Generated from qdbusabstractinterface.pro. + +##################################################################### +## tst_qdbusabstractinterface Test: +##################################################################### +# special case begin +# this test can not be generated here. It needs to be set up in the +# parent directory +# special case end 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..671403999b --- /dev/null +++ b/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qmyserver.pro. + +##################################################################### +## qmyserver_qdbusinterface Binary: +##################################################################### + +add_qt_executable(qmyserver_qdbusinterface + 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..de633f2aa9 100644 --- a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt +++ b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt @@ -1,19 +1,15 @@ # 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 + 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/qdbusinterface/qmyserver/qmyserver.pro b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro index 8f2d261899..406f3d7d36 100644 --- a/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro +++ b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro @@ -1,6 +1,6 @@ SOURCES = qmyserver.cpp HEADERS = ../myobject.h -TARGET = qmyserver +TARGET = qmyserver_qdbusinterface DESTDIR = ./ QT = core dbus CONFIG -= app_bundle diff --git a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp index ca3b779fea..e416266b5f 100644 --- a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp +++ b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp @@ -31,6 +31,7 @@ #include <qcoreapplication.h> #include <qmetatype.h> #include <QtTest/QtTest> +#include <QtCore/qregularexpression.h> #include <QtCore/qvariant.h> #include <QtDBus/QtDBus> #include <QtDBus/private/qdbus_symbols_p.h> @@ -451,14 +452,16 @@ void tst_QDBusInterface::introspectVirtualObject() QDBusMessage message = QDBusMessage::createMethodCall(con.baseService(), path, "org.freedesktop.DBus.Introspectable", "Introspect"); QDBusMessage reply = con.call(message, QDBus::Block, 5000); QVERIFY(reply.arguments().at(0).toString().contains( - QRegExp("<node>.*zitroneneis.*<interface name=") )); + QRegularExpression("<node>.*zitroneneis.*<interface name=", + QRegularExpression::DotMatchesEverythingOption))); QDBusMessage message2 = QDBusMessage::createMethodCall(con.baseService(), path + "/foo", "org.freedesktop.DBus.Introspectable", "Introspect"); QDBusMessage reply2 = con.call(message2, QDBus::Block, 5000); QVERIFY(reply2.arguments().at(0).toString().contains( - QRegExp("<node>.*<interface name=\"org.qtproject.QtDBus.VirtualObject\">" - ".*<method name=\"klingeling\" />\n" - ".*</interface>.*<interface name=") )); + QRegularExpression("<node>.*<interface name=\"org.qtproject.QtDBus.VirtualObject\">" + ".*<method name=\"klingeling\" />\n" + ".*</interface>.*<interface name=", + QRegularExpression::DotMatchesEverythingOption))); } void tst_QDBusInterface::callMethod() 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..fc5f59990f --- /dev/null +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt @@ -0,0 +1,29 @@ +# Generated from qdbusmarshall.pro. + +##################################################################### +## tst_qdbusmarshall Test: +##################################################################### + +add_qt_test(tst_qdbusmarshall + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" + SOURCES + ../tst_qdbusmarshall.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::DBusPrivate +) + +## 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..bd615ab900 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt @@ -1,13 +1,14 @@ # 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 + PUBLIC_LIBRARIES Qt::CorePrivate Qt::DBusPrivate ) @@ -15,19 +16,16 @@ add_qt_test(tst_qdbusmarshall ## 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..31cf3aff44 100644 --- a/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt +++ b/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt @@ -7,6 +7,6 @@ add_qt_test(tst_qdbusmetaobject SOURCES tst_qdbusmetaobject.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::DBusPrivate ) 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/qdbusmetatype/tst_qdbusmetatype.cpp b/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp index 4b926dcd05..ec3e71ac8f 100644 --- a/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp +++ b/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp @@ -402,7 +402,7 @@ void tst_QDBusMetaType::invalidTypes() else if (qstrcmp(QTest::currentDataTag(), "Invalid7") == 0) QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type `Invalid7' produces invalid D-BUS signature `()' (Did you forget to call beginStructure() ?)"); else if (qstrcmp(QTest::currentDataTag(), "QList<Invalid0>") == 0) - QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type `QList<Invalid0>' produces invalid D-BUS signature `a' (Did you forget to call beginStructure() ?)"); + QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type `QVector<Invalid0>' produces invalid D-BUS signature `a' (Did you forget to call beginStructure() ?)"); staticTypes(); staticTypes(); // run twice: the error messages should be printed once only 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..34456d6331 100644 --- a/tests/auto/dbus/qdbustype/CMakeLists.txt +++ b/tests/auto/dbus/qdbustype/CMakeLists.txt @@ -7,28 +7,22 @@ add_qt_test(tst_qdbustype SOURCES tst_qdbustype.cpp - LIBRARIES + PUBLIC_LIBRARIES 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..879f8d28e4 100644 --- a/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt +++ b/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt @@ -7,7 +7,7 @@ add_qt_test(tst_qdbusxmlparser SOURCES tst_qdbusxmlparser.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::DBusPrivate Qt::Xml |