summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp')
-rw-r--r--tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
index 4f6c7defda..9458a97c6f 100644
--- a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
+++ b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
@@ -55,9 +55,7 @@ class tst_QClipboard : public QObject
{
Q_OBJECT
private slots:
-#if (defined(Q_OS_WIN) || defined(Q_OS_MAC)) && !defined(QT_NO_PROCESS)
void copy_exit_paste();
-#endif
void capabiliyFunctions();
void modes();
void testSignals();
@@ -188,12 +186,13 @@ void tst_QClipboard::testSignals()
}
// Test that pasted text remains on the clipboard after a Qt application exits.
-// This test does not make sense on X11 and embedded, as copied data disappears
-// from the clipboard when the application exits. It's still possible to test
-// copy/paste - just keep the apps running.
-#if (defined(Q_OS_WIN) || defined(Q_OS_MAC)) && !defined(QT_NO_PROCESS)
void tst_QClipboard::copy_exit_paste()
{
+#ifndef QT_NO_PROCESS
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
+ QSKIP("This test does not make sense on X11 and embedded, copied data disappears from the clipboard when the application exits ");
+ // ### It's still possible to test copy/paste - just keep the apps running
+#endif
if (!nativeClipboardWorking())
QSKIP("Native clipboard not working in this setup");
const QStringList stringArgument = QStringList() << "Test string.";
@@ -203,8 +202,8 @@ void tst_QClipboard::copy_exit_paste()
QTest::qWait(100);
#endif
QCOMPARE(QProcess::execute("paster/paster", stringArgument), 0);
-}
#endif
+}
void tst_QClipboard::setMimeData()
{