diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 01:01:02 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 01:01:03 +0200 |
commit | ab5153aa0b09320dc5c96aa2b5a564ea1e6dbed3 (patch) | |
tree | bbb46d30b7a0b6122a8da1fba7cf8ac2a4b835a7 /tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp | |
parent | 56e5e06ff2f3a2230bb7780c73c85b73f9aaa4f8 (diff) | |
parent | 52484cc4b6696c8a5c1f69125d81eb0cede8cdb2 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I5b671c89ceb8998b37f99d58df0e0a9e5785e3ad
Diffstat (limited to 'tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp')
-rw-r--r-- | tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp b/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp index 84120c70e9..82ab9c9c3b 100644 --- a/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp +++ b/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp @@ -612,6 +612,9 @@ ButtonWidget::ButtonWidget() // ------------------------------------------------------------------ void tst_QShortcut::disabledItems() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + ButtonWidget mainW; mainW.setWindowTitle(QTest::currentTestFunction()); mainW.show(); @@ -692,6 +695,9 @@ void tst_QShortcut::disabledItems() // ------------------------------------------------------------------ void tst_QShortcut::ambiguousRotation() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + MainWindow mainW; const QString name = QLatin1String(QTest::currentTestFunction()); mainW.setWindowTitle(name); @@ -834,6 +840,9 @@ void tst_QShortcut::ambiguousRotation() void tst_QShortcut::ambiguousItems() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + ButtonWidget mainW; mainW.setWindowTitle(QTest::currentTestFunction()); mainW.show(); @@ -874,6 +883,9 @@ void tst_QShortcut::ambiguousItems() // ------------------------------------------------------------------ void tst_QShortcut::unicodeCompare() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + ButtonWidget mainW; mainW.setWindowTitle(QTest::currentTestFunction()); mainW.show(); @@ -906,6 +918,9 @@ void tst_QShortcut::unicodeCompare() // ------------------------------------------------------------------ void tst_QShortcut::keypressConsumption() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + MainWindow mainW; mainW.setWindowTitle(QTest::currentTestFunction()); mainW.show(); @@ -1099,6 +1114,9 @@ public: void tst_QShortcut::duplicatedShortcutOverride() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + OverrideCountingWidget w; w.setWindowTitle(Q_FUNC_INFO); w.resize(200, 200); @@ -1199,6 +1217,9 @@ void tst_QShortcut::sendKeyEvents(QWidget *w, int k1, QChar c1, int k2, QChar c2 void tst_QShortcut::testElement() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + static QScopedPointer<MainWindow> mainW; currentResult = NoResult; @@ -1243,6 +1264,9 @@ void tst_QShortcut::testElement() void tst_QShortcut::shortcutToFocusProxy() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QLineEdit le; QCompleter completer; QStringListModel *slm = new QStringListModel(QStringList() << "a0" << "a1" << "a2", &completer); |