diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-05 17:30:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-09-05 17:30:11 +0200 |
| commit | ee16df4f0f4ec884abf5b676706ecd1c8851b8a0 (patch) | |
| tree | 2b750ca1614354a6f7f5634615ca67b9f01876b5 /tests/auto/inputpanel/data/tst_inputpanel.qml | |
| parent | c11c0886266cffa34210ca287a6a99ec1633d56b (diff) | |
| parent | c40e19e8012788522806f25589d7c41d93d423b4 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/virtualkeyboard/platforminputcontext.cpp
Change-Id: Ic12049c5bfa598fff6e6c896a9b6ee73f664b681
Diffstat (limited to 'tests/auto/inputpanel/data/tst_inputpanel.qml')
| -rw-r--r-- | tests/auto/inputpanel/data/tst_inputpanel.qml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/inputpanel/data/tst_inputpanel.qml b/tests/auto/inputpanel/data/tst_inputpanel.qml index faaf44ce..eea2f97e 100644 --- a/tests/auto/inputpanel/data/tst_inputpanel.qml +++ b/tests/auto/inputpanel/data/tst_inputpanel.qml @@ -29,6 +29,7 @@ import QtTest 1.0 import QtQuick 2.0 +import QtQuick.Window 2.3 Rectangle { id: container @@ -83,6 +84,13 @@ Rectangle { inputPanel.setWclAutoCommitWord(data !== undefined && data.hasOwnProperty("wclAutoCommitWord") && data.wclAutoCommitWord) inputPanel.setFullScreenMode(data !== undefined && data.hasOwnProperty("fullScreenMode") && data.fullScreenMode) inputPanel.setExternalLanguageSwitchEnabled(data !== undefined && data.hasOwnProperty("externalLanguageSwitchEnabled") && data.externalLanguageSwitchEnabled) + + var window = container.Window.window + verify(window) + window.raise() + window.requestActivate() + tryCompare(window, "active", true) + container.forceActiveFocus() waitForRendering(container) if (data !== undefined && data.hasOwnProperty("initText")) { |