diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:46:19 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:46:39 +0100 |
| commit | d3f40bea1b424f60b178faf6bcb45927ce56e083 (patch) | |
| tree | e6b45cad5d67b5f6d9c2c88457da9f56c58c6a9c /tests | |
| parent | 5714b7dea100bb4874d17e2f422ff24752c17f18 (diff) | |
| parent | 1a9158bfbdd8dd01bac591c11bb0d0bf46514ddb (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I84cccac7024c1c48b6419838bb424e45cb2557d4
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/inputpanel/BLACKLIST | 8 | ||||
| -rw-r--r-- | tests/auto/inputpanel/data/tst_inputpanel.qml | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/inputpanel/BLACKLIST b/tests/auto/inputpanel/BLACKLIST index b814578b..462882f7 100644 --- a/tests/auto/inputpanel/BLACKLIST +++ b/tests/auto/inputpanel/BLACKLIST @@ -4,3 +4,11 @@ [tst_plugin::test_wclAutoCommitWordSetting:row 0] b2qt +# QTBUG-65507 +[tst_plugin::test_inputMethodHints:row 8] +b2qt + +# QTBUG-65507 +[tst_plugin::test_shiftCapsLock:row 1] +b2qt + diff --git a/tests/auto/inputpanel/data/tst_inputpanel.qml b/tests/auto/inputpanel/data/tst_inputpanel.qml index f9164f97..0b9f11ff 100644 --- a/tests/auto/inputpanel/data/tst_inputpanel.qml +++ b/tests/auto/inputpanel/data/tst_inputpanel.qml @@ -1199,6 +1199,10 @@ Rectangle { } function test_hwrSpellCorrectionSuggestions(data) { + if (Qt.platform.pluginName === "offscreen") { + skip("QTBUG-65507"); + } + prepareTest(data) if (!inputPanel.setHandwritingMode(true)) |