diff options
author | Liang Qi <liang.qi@qt.io> | 2018-06-13 11:07:13 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-06-13 11:07:13 +0200 |
commit | 769b2e8307b3d54d29fc74977fa4b683f90335ae (patch) | |
tree | 5d4da4bb5893bbb9bf43728e2b4d02fa1d954ec7 /tests | |
parent | d6cf5bc2d6181c6491e2a1f33261ff525a745b8c (diff) | |
parent | 5ed830b81d76ca96514c3663206286b0a9519741 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
src/virtualkeyboard/pinyindecoderservice.cpp
src/virtualkeyboard/tcinputmethod.cpp
Change-Id: Ie111173f60bc622ceda18bd5ee4a0e4b0e0a00ae
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/inputpanel/data/tst_inputpanel.qml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/inputpanel/data/tst_inputpanel.qml b/tests/auto/inputpanel/data/tst_inputpanel.qml index e24cdb0b..9ecbc516 100644 --- a/tests/auto/inputpanel/data/tst_inputpanel.qml +++ b/tests/auto/inputpanel/data/tst_inputpanel.qml @@ -798,6 +798,10 @@ Rectangle { } function test_spellCorrectionAutomaticSpaceInsertion(data) { + if (Qt.platform.pluginName === "offscreen") { + skip("QTBUG-68349"); + } + prepareTest(data) for (var inputIndex in data.inputSequence) { |