summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/kernel/qclipboard/test
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/gui/kernel/qclipboard/test')
-rw-r--r--tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt24
-rw-r--r--tests/auto/gui/kernel/qclipboard/test/BLACKLIST5
-rw-r--r--tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt12
-rw-r--r--tests/auto/gui/kernel/qclipboard/test/test.pro18
4 files changed, 11 insertions, 48 deletions
diff --git a/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt
deleted file mode 100644
index e7c1313c7b..0000000000
--- a/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# Generated from test.pro.
-
-#####################################################################
-## tst_qclipboard Test:
-#####################################################################
-
-add_qt_test(tst_qclipboard
- OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
- SOURCES
- ../tst_qclipboard.cpp
- PUBLIC_LIBRARIES
- Qt::Gui
-)
-
-## Scopes:
-#####################################################################
-
-extend_target(tst_qclipboard CONDITION MACOS
- PUBLIC_LIBRARIES
- ${FWAppKit}
-)
-
-#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID:
-# TEST_HELPER_INSTALLS = "../copier/copier" "../paster/paster"
diff --git a/tests/auto/gui/kernel/qclipboard/test/BLACKLIST b/tests/auto/gui/kernel/qclipboard/test/BLACKLIST
new file mode 100644
index 0000000000..3ca7791b37
--- /dev/null
+++ b/tests/auto/gui/kernel/qclipboard/test/BLACKLIST
@@ -0,0 +1,5 @@
+# QTBUG-87429
+[testSignals]
+android
+[setMimeData]
+android
diff --git a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
index 1e2c89e538..fad30c16fd 100644
--- a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
@@ -1,14 +1,15 @@
-# Generated from test.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## tst_qclipboard Test:
#####################################################################
-qt_add_test(tst_qclipboard
+qt_internal_add_test(tst_qclipboard
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
SOURCES
../tst_qclipboard.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Gui
Qt::GuiPrivate
)
@@ -16,10 +17,9 @@ qt_add_test(tst_qclipboard
## Scopes:
#####################################################################
-qt_extend_target(tst_qclipboard CONDITION MACOS
- PUBLIC_LIBRARIES
+qt_internal_extend_target(tst_qclipboard CONDITION MACOS
+ LIBRARIES
${FWAppKit}
)
-#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID:
# TEST_HELPER_INSTALLS = "../copier/copier" "../paster/paster"
diff --git a/tests/auto/gui/kernel/qclipboard/test/test.pro b/tests/auto/gui/kernel/qclipboard/test/test.pro
deleted file mode 100644
index 8ccdecd405..0000000000
--- a/tests/auto/gui/kernel/qclipboard/test/test.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-CONFIG += testcase
-SOURCES += ../tst_qclipboard.cpp
-TARGET = ../tst_qclipboard
-QT += testlib gui-private
-
-osx: LIBS += -framework AppKit
-
-win32 {
- CONFIG(debug, debug|release) {
- TARGET = ../../debug/tst_qclipboard
-} else {
- TARGET = ../../release/tst_qclipboard
- }
-}
-
-!android: TEST_HELPER_INSTALLS = \
- ../copier/copier \
- ../paster/paster