diff options
Diffstat (limited to 'tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp')
| -rw-r--r-- | tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp index 34bc581396..88506e66a6 100644 --- a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp +++ b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp @@ -55,8 +55,9 @@ class tst_QClipboard : public QObject { Q_OBJECT private slots: - +#if !defined(Q_WS_X11) && !defined(Q_WS_QWS) && !defined(Q_WS_QPA) && !defined(QT_NO_PROCESS) void copy_exit_paste(); +#endif void capabiliyFunctions(); void modes(); void testSignals(); @@ -186,17 +187,13 @@ void tst_QClipboard::testSignals() QCOMPARE(dataChangedSpy.count(), 1); } -/* - Test that pasted text remain on the clipboard - after a Qt application exits. -*/ +// 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_WS_X11) && !defined(Q_WS_QWS) && !defined(Q_WS_QPA) && !defined(QT_NO_PROCESS) void tst_QClipboard::copy_exit_paste() { -#ifndef QT_NO_PROCESS -#if defined Q_WS_X11 || defined Q_WS_QWS || defined (Q_WS_QPA) - QSKIP("This test does not make sense on X11 and embedded, copied data disappears from the clipboard when the application exits ", SkipAll); - // ### It's still possible to test copy/paste - just keep the apps running -#endif if (!nativeClipboardWorking()) QSKIP("Native clipboard not working in this setup", SkipAll); const QStringList stringArgument = QStringList() << "Test string."; @@ -206,8 +203,8 @@ void tst_QClipboard::copy_exit_paste() QTest::qWait(100); #endif QCOMPARE(QProcess::execute("paster/paster", stringArgument), 0); -#endif } +#endif void tst_QClipboard::setMimeData() { |