diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2012-10-16 12:01:16 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-17 21:06:30 +0200 |
| commit | 8a2d1ce2c67607abb7ca919da22307923fd3a924 (patch) | |
| tree | 064f049e89e7de2c2314afb6447f808333f59d46 /tests/auto/gui/kernel/qkeysequence | |
| parent | ceb5474d5f71e223373cc957af4a073886e326bd (diff) | |
Test: remove QSKIP and remove whole test cases instead.
Change-Id: I8b625d20a2cf9215cbfdb96cd252bf1c81bba522
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'tests/auto/gui/kernel/qkeysequence')
| -rw-r--r-- | tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp index 601847270e..f7930550cc 100644 --- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp +++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp @@ -119,8 +119,10 @@ private slots: void symetricConstructors(); void checkMultipleNames(); void checkMultipleCodes(); +#ifndef Q_OS_MAC void mnemonic_data(); void mnemonic(); +#endif void toString_data(); void toString(); void toStringFromKeycode_data(); @@ -137,8 +139,10 @@ private slots: void standardKeys_data(); void standardKeys(); void keyBindings(); +#if !defined (Q_OS_MAC) && !defined (Q_OS_WINCE) void translated_data(); void translated(); +#endif void i18nKeys_data(); void i18nKeys(); @@ -396,6 +400,7 @@ void tst_QKeySequence::keyBindings() QCOMPARE(bindings, expected); } +#ifndef Q_OS_MAC void tst_QKeySequence::mnemonic_data() { QTest::addColumn<QString>("string"); @@ -417,9 +422,6 @@ void tst_QKeySequence::mnemonic_data() void tst_QKeySequence::mnemonic() { -#ifdef Q_OS_MAC - QSKIP("mnemonics are not used on Mac OS X"); -#endif QFETCH(QString, string); QFETCH(QString, key); QFETCH(bool, warning); @@ -438,6 +440,7 @@ void tst_QKeySequence::mnemonic() QCOMPARE(seq, res); } +#endif void tst_QKeySequence::toString_data() { @@ -628,6 +631,7 @@ void tst_QKeySequence::fromString() QCOMPARE(ks4, ks1); } +#if !defined (Q_OS_MAC) && !defined (Q_OS_WINCE) void tst_QKeySequence::translated_data() { qApp->installTranslator(ourTranslator); @@ -659,11 +663,6 @@ void tst_QKeySequence::translated() { QFETCH(QString, transKey); QFETCH(QString, compKey); -#ifdef Q_OS_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); @@ -674,7 +673,7 @@ void tst_QKeySequence::translated() qApp->removeTranslator(ourTranslator); qApp->removeTranslator(qtTranslator); } - +#endif void tst_QKeySequence::i18nKeys_data() { |