diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2018-09-13 13:10:10 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-09-27 08:13:57 +0000 |
commit | 5260805b162030a6900bacf46d2a55b69075ae09 (patch) | |
tree | 935b9da293776792bbfff5cdad568996690c6e3e /tests | |
parent | 87c5967277c26c8154c2fee1db5ba3debb9b5b19 (diff) |
Qtify new API
Add "is" to C++ getter functions returning bool (where applicable).
Add "Active" to "shift" and "capsLock" QML properties, etc. By making
these names more explicit, it's clearer what they do and also
future-proofs the API by allowing us to add related properties in
the future if necessary.
[ChangeLog][InputContext] Deprecated shift and capsLock properties
in favor of shiftActive and capsLockActive.
Change-Id: I66f2c85b50622a6e5fe6b25fb24f13be27acaf9d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/inputpanel/data/inputpanel/inputpanel.qml | 10 | ||||
-rw-r--r-- | tests/auto/inputpanel/data/tst_inputpanel.qml | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/inputpanel/data/inputpanel/inputpanel.qml b/tests/auto/inputpanel/data/inputpanel/inputpanel.qml index 3bccb337..79526c91 100644 --- a/tests/auto/inputpanel/data/inputpanel/inputpanel.qml +++ b/tests/auto/inputpanel/data/inputpanel/inputpanel.qml @@ -196,7 +196,7 @@ InputPanel { SignalSpy { id: shiftStateSpy target: InputContext - signalName: "onShiftChanged" + signalName: "onShiftActiveChanged" } SignalSpy { @@ -621,12 +621,12 @@ InputPanel { InputContext.priv.shiftHandler.toggleShift() } - function setShift(shift) { - InputContext.priv.shiftHandler.shift = shift + function setShiftActive(shiftActive) { + InputContext.priv.shiftHandler.shiftActive = shiftActive } - function setCapsLock(capsLock) { - InputContext.priv.shiftHandler.capsLock = capsLock + function setCapsLockActive(capsLockActive) { + InputContext.priv.shiftHandler.capsLockActive = capsLockActive } function style() { diff --git a/tests/auto/inputpanel/data/tst_inputpanel.qml b/tests/auto/inputpanel/data/tst_inputpanel.qml index 7cea7058..91a6e13f 100644 --- a/tests/auto/inputpanel/data/tst_inputpanel.qml +++ b/tests/auto/inputpanel/data/tst_inputpanel.qml @@ -2108,9 +2108,9 @@ Rectangle { skip("Prediction/spell correction not enabled") if (data.hasOwnProperty("initShift")) - inputPanel.setShift(data.initShift) + inputPanel.setShiftActive(data.initShift) if (data.hasOwnProperty("initCapsLock")) - inputPanel.setCapsLock(data.initCapsLock) + inputPanel.setCapsLockActive(data.initCapsLock) for (var inputIndex in data.inputSequence) inputPanel.virtualKeyClick(data.inputSequence[inputIndex]) |