diff options
Diffstat (limited to 'tests/auto/gui/kernel')
| -rw-r--r-- | tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp | 13 | ||||
| -rw-r--r-- | tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp | 19 |
2 files changed, 15 insertions, 17 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() { diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp index 0a2a20a29b..44380d2cd1 100644 --- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp +++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp @@ -121,10 +121,8 @@ private slots: void symetricConstructors(); void checkMultipleNames(); void checkMultipleCodes(); -#ifndef Q_WS_MAC void mnemonic_data(); void mnemonic(); -#endif void toString_data(); void toString(); void streamOperators_data(); @@ -135,10 +133,8 @@ private slots: void standardKeys_data(); void standardKeys(); void keyBindings(); -#if !defined(Q_WS_MAC) && !defined(Q_OS_WINCE) void translated_data(); void translated(); -#endif void i18nKeys_data(); void i18nKeys(); @@ -384,8 +380,6 @@ void tst_QKeySequence::keyBindings() QVERIFY(bindings == expected); } -// mnemonics are not used on Mac OS X. -#ifndef Q_WS_MAC void tst_QKeySequence::mnemonic_data() { QTest::addColumn<QString>("string"); @@ -407,6 +401,9 @@ void tst_QKeySequence::mnemonic_data() void tst_QKeySequence::mnemonic() { +#ifdef Q_WS_MAC + QSKIP("mnemonics are not used on Mac OS X"); +#endif QFETCH(QString, string); QFETCH(QString, key); QFETCH(bool, warning); @@ -423,7 +420,6 @@ void tst_QKeySequence::mnemonic() QCOMPARE(seq, res); } -#endif void tst_QKeySequence::toString_data() { @@ -531,8 +527,6 @@ void tst_QKeySequence::fromString() QCOMPARE(ks4, ks1); } -// No need to translate modifiers on Mac OS X or WinCE. -#if !defined(Q_WS_MAC) && !defined(Q_OS_WINCE) void tst_QKeySequence::translated_data() { qApp->installTranslator(ourTranslator); @@ -564,6 +558,11 @@ void tst_QKeySequence::translated() { QFETCH(QString, transKey); QFETCH(QString, compKey); +#ifdef Q_WS_MAC + QSKIP("No need to translate modifiers on Mac OS X"); +#elif defined(Q_OS_WINCE) + QSKIP("No need to translate modifiers on WinCE"); +#endif qApp->installTranslator(ourTranslator); qApp->installTranslator(qtTranslator); @@ -574,7 +573,7 @@ void tst_QKeySequence::translated() qApp->removeTranslator(ourTranslator); qApp->removeTranslator(qtTranslator); } -#endif + void tst_QKeySequence::i18nKeys_data() { |