diff options
Diffstat (limited to 'tests/auto/dbus/qdbusmarshall/qdbusmarshall')
3 files changed, 7 insertions, 50 deletions
diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt deleted file mode 100644 index 9130f434b5..0000000000 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -# Generated from qdbusmarshall.pro. - -##################################################################### -## tst_qdbusmarshall Test: -##################################################################### - -qt_add_test(tst_qdbusmarshall - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" - SOURCES - ../tst_qdbusmarshall.cpp - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::DBusPrivate -) - -## Scopes: -##################################################################### - -qt_extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked - DEFINES - QT_LINKED_LIBDBUS - PUBLIC_LIBRARIES - dbus-1 -) - -qt_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 86ef627276..daad23cdf5 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt @@ -1,14 +1,15 @@ -# Generated from qdbusmarshall.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qdbusmarshall Test: ##################################################################### -qt_add_test(tst_qdbusmarshall +qt_internal_add_test(tst_qdbusmarshall OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qdbusmarshall.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate Qt::DBusPrivate ) @@ -16,18 +17,16 @@ qt_add_test(tst_qdbusmarshall ## Scopes: ##################################################################### -# 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 -qt_extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked +qt_internal_extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked DEFINES QT_LINKED_LIBDBUS - PUBLIC_LIBRARIES + LIBRARIES dbus-1 ) -qt_extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked +qt_internal_extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked SOURCES ../../../../../src/dbus/qdbus_symbols.cpp ) diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro deleted file mode 100644 index 031cc252c8..0000000000 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro +++ /dev/null @@ -1,13 +0,0 @@ -CONFIG += testcase -SOURCES += ../tst_qdbusmarshall.cpp -TARGET = ../tst_qdbusmarshall -DESTDIR = ./ - -QT = core-private dbus-private testlib - -qtConfig(dbus-linked) { - DEFINES += QT_LINKED_LIBDBUS - QMAKE_USE += dbus -} else { - SOURCES += ../../../../../src/dbus/qdbus_symbols.cpp -} |