Regenerate tests/auto/dbus

Change-Id: I105eb73065e02a4fa508d17f481047b32875f128 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-12 18:12:15 +01:00 · 2019-11-12 18:12:15 +01:00 · 8305b6fe3f
commit 8305b6fe3f
parent 0650bafa59
26 changed files with 120 additions and 51 deletions
--- a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt
+++ 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
+)
--- 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
 )
--- a/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt
+++ 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
+)
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- a/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt
+++ 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
+)
--- 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
 )
--- 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
 )
--- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt
+++ 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
+)
--- 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
--- 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
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
+)
--- 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
 )