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>

25 files changed, 218 insertions, 214 deletions

diff --git a/src/import/plugins.qmltypes b/src/import/plugins.qmltypes
index 97b78ca4..8e6c3c02 100644
--- a/src/import/plugins.qmltypes
+++ b/src/import/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -defaultplatform -nonrelocatable -dependencies C:/Users/jarkko/work/qtvirtualkeyboard/src/import/dependencies.json QtQuick.VirtualKeyboard 2.4'
+// 'qmlplugindump -defaultplatform -nonrelocatable -dependencies dependencies.json QtQuick.VirtualKeyboard 2.4'
 
 Module {
     dependencies: [
@@ -18,13 +18,16 @@ Module {
         prototype: "QObject"
         exports: [
             "QtQuick.VirtualKeyboard/InputContext 1.0",
-            "QtQuick.VirtualKeyboard/InputContext 2.0"
+            "QtQuick.VirtualKeyboard/InputContext 2.0",
+            "QtQuick.VirtualKeyboard/InputContext 2.4"
         ]
         isCreatable: false
         isSingleton: true
-        exportMetaObjectRevisions: [0, 0]
+        exportMetaObjectRevisions: [0, 0, 0]
         Property { name: "shift"; type: "bool"; isReadonly: true }
+        Property { name: "shiftActive"; revision: 4; type: "bool"; isReadonly: true }
         Property { name: "capsLock"; type: "bool"; isReadonly: true }
+        Property { name: "capsLockActive"; revision: 4; type: "bool"; isReadonly: true }
         Property { name: "uppercase"; type: "bool"; isReadonly: true }
         Property { name: "anchorPosition"; type: "int"; isReadonly: true }
         Property { name: "cursorPosition"; type: "int"; isReadonly: true }
@@ -352,8 +355,8 @@ Module {
         Property { name: "traceId"; type: "int" }
         Property { name: "channels"; type: "QStringList" }
         Property { name: "length"; type: "int"; isReadonly: true }
-        Property { name: "isFinal"; type: "bool" }
-        Property { name: "isCanceled"; type: "bool" }
+        Property { name: "final"; type: "bool" }
+        Property { name: "canceled"; type: "bool" }
         Property { name: "opacity"; type: "double" }
         Signal {
             name: "traceIdChanged"
@@ -497,16 +500,16 @@ Module {
         Property { name: "sentenceEndingCharacters"; type: "string" }
         Property { name: "autoCapitalizationEnabled"; type: "bool"; isReadonly: true }
         Property { name: "toggleShiftEnabled"; type: "bool"; isReadonly: true }
-        Property { name: "shift"; type: "bool" }
-        Property { name: "capsLock"; type: "bool" }
+        Property { name: "shiftActive"; type: "bool" }
+        Property { name: "capsLockActive"; type: "bool" }
         Property { name: "uppercase"; type: "bool"; isReadonly: true }
         Method { name: "toggleShift" }
         Method { name: "clearToggleShiftTimer" }
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/AlternativeKeys 2.0"
-        exports: ["QtQuick.VirtualKeyboard/AlternativeKeys 2.0"]
+        name: "QtQuick.VirtualKeyboard/AlternativeKeys 1.0"
+        exports: ["QtQuick.VirtualKeyboard/AlternativeKeys 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -532,8 +535,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/AlternativeKeys 1.0"
-        exports: ["QtQuick.VirtualKeyboard/AlternativeKeys 1.0"]
+        name: "QtQuick.VirtualKeyboard/AlternativeKeys 2.0"
+        exports: ["QtQuick.VirtualKeyboard/AlternativeKeys 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -675,8 +678,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/ChangeLanguageKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/ChangeLanguageKey 2.0"]
+        name: "QtQuick.VirtualKeyboard/ChangeLanguageKey 1.0"
+        exports: ["QtQuick.VirtualKeyboard/ChangeLanguageKey 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -705,8 +708,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/ChangeLanguageKey 1.0"
-        exports: ["QtQuick.VirtualKeyboard/ChangeLanguageKey 1.0"]
+        name: "QtQuick.VirtualKeyboard/ChangeLanguageKey 2.0"
+        exports: ["QtQuick.VirtualKeyboard/ChangeLanguageKey 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -735,8 +738,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/CharacterPreviewBubble 1.0"
-        exports: ["QtQuick.VirtualKeyboard/CharacterPreviewBubble 1.0"]
+        name: "QtQuick.VirtualKeyboard/CharacterPreviewBubble 2.0"
+        exports: ["QtQuick.VirtualKeyboard/CharacterPreviewBubble 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -745,8 +748,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/CharacterPreviewBubble 2.0"
-        exports: ["QtQuick.VirtualKeyboard/CharacterPreviewBubble 2.0"]
+        name: "QtQuick.VirtualKeyboard/CharacterPreviewBubble 1.0"
+        exports: ["QtQuick.VirtualKeyboard/CharacterPreviewBubble 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -913,8 +916,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/HideKeyboardKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/HideKeyboardKey 2.0"]
+        name: "QtQuick.VirtualKeyboard/HideKeyboardKey 1.0"
+        exports: ["QtQuick.VirtualKeyboard/HideKeyboardKey 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -942,8 +945,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/HideKeyboardKey 1.0"
-        exports: ["QtQuick.VirtualKeyboard/HideKeyboardKey 1.0"]
+        name: "QtQuick.VirtualKeyboard/HideKeyboardKey 2.0"
+        exports: ["QtQuick.VirtualKeyboard/HideKeyboardKey 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -1015,9 +1018,9 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 1.0"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 1.0"]
-        exportMetaObjectRevisions: [0]
+        name: "QtQuick.VirtualKeyboard/InputPanel 2.3"
+        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.3"]
+        exportMetaObjectRevisions: [3]
         isComposite: true
         defaultProperty: "data"
         Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
@@ -1049,9 +1052,9 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 2.0"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.0"]
-        exportMetaObjectRevisions: [0]
+        name: "QtQuick.VirtualKeyboard/InputPanel 2.1"
+        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.1"]
+        exportMetaObjectRevisions: [1]
         isComposite: true
         defaultProperty: "data"
         Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
@@ -1083,9 +1086,9 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 2.2"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.2"]
-        exportMetaObjectRevisions: [2]
+        name: "QtQuick.VirtualKeyboard/InputPanel 1.3"
+        exports: ["QtQuick.VirtualKeyboard/InputPanel 1.3"]
+        exportMetaObjectRevisions: [3]
         isComposite: true
         defaultProperty: "data"
         Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
@@ -1100,9 +1103,9 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 2.1"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.1"]
-        exportMetaObjectRevisions: [1]
+        name: "QtQuick.VirtualKeyboard/InputPanel 2.2"
+        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.2"]
+        exportMetaObjectRevisions: [2]
         isComposite: true
         defaultProperty: "data"
         Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
@@ -1117,9 +1120,9 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 2.3"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.3"]
-        exportMetaObjectRevisions: [3]
+        name: "QtQuick.VirtualKeyboard/InputPanel 1.0"
+        exports: ["QtQuick.VirtualKeyboard/InputPanel 1.0"]
+        exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
         Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
@@ -1134,9 +1137,9 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/InputPanel 1.3"
-        exports: ["QtQuick.VirtualKeyboard/InputPanel 1.3"]
-        exportMetaObjectRevisions: [3]
+        name: "QtQuick.VirtualKeyboard/InputPanel 2.0"
+        exports: ["QtQuick.VirtualKeyboard/InputPanel 2.0"]
+        exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
         Property { name: "externalLanguageSwitchEnabled"; type: "bool" }
@@ -1151,8 +1154,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/Key 2.0"
-        exports: ["QtQuick.VirtualKeyboard/Key 2.0"]
+        name: "QtQuick.VirtualKeyboard/Key 1.0"
+        exports: ["QtQuick.VirtualKeyboard/Key 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -1180,8 +1183,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/Key 1.0"
-        exports: ["QtQuick.VirtualKeyboard/Key 1.0"]
+        name: "QtQuick.VirtualKeyboard/Key 2.0"
+        exports: ["QtQuick.VirtualKeyboard/Key 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -1209,8 +1212,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/Keyboard 2.0"
-        exports: ["QtQuick.VirtualKeyboard/Keyboard 2.0"]
+        name: "QtQuick.VirtualKeyboard/Keyboard 1.0"
+        exports: ["QtQuick.VirtualKeyboard/Keyboard 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -1338,8 +1341,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/Keyboard 1.0"
-        exports: ["QtQuick.VirtualKeyboard/Keyboard 1.0"]
+        name: "QtQuick.VirtualKeyboard/Keyboard 2.0"
+        exports: ["QtQuick.VirtualKeyboard/Keyboard 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -1590,45 +1593,9 @@ Module {
         Signal { name: "clicked" }
     }
     Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/MultiSoundEffect 2.0"
-        exports: ["QtQuick.VirtualKeyboard/MultiSoundEffect 2.0"]
-        exportMetaObjectRevisions: [0]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "source"; type: "QUrl" }
-        Property { name: "maxInstances"; type: "int" }
-        Property { name: "__cachedInstances"; type: "QVariant" }
-        Property { name: "__currentIndex"; type: "int" }
-        Signal {
-            name: "playingChanged"
-            Parameter { name: "source"; type: "QUrl" }
-            Parameter { name: "playing"; type: "bool" }
-        }
-        Method { name: "play"; type: "QVariant" }
-    }
-    Component {
-        prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/MultiSoundEffect 1.1"
-        exports: ["QtQuick.VirtualKeyboard/MultiSoundEffect 1.1"]
-        exportMetaObjectRevisions: [1]
-        isComposite: true
-        defaultProperty: "data"
-        Property { name: "source"; type: "QUrl" }
-        Property { name: "maxInstances"; type: "int" }
-        Property { name: "__cachedInstances"; type: "QVariant" }
-        Property { name: "__currentIndex"; type: "int" }
-        Signal {
-            name: "playingChanged"
-            Parameter { name: "source"; type: "QUrl" }
-            Parameter { name: "playing"; type: "bool" }
-        }
-        Method { name: "play"; type: "QVariant" }
-    }
-    Component {
         prototype: "QVirtualKeyboardAbstractInputMethod"
-        name: "QtQuick.VirtualKeyboard/MultitapInputMethod 2.0"
-        exports: ["QtQuick.VirtualKeyboard/MultitapInputMethod 2.0"]
+        name: "QtQuick.VirtualKeyboard/MultitapInputMethod 1.0"
+        exports: ["QtQuick.VirtualKeyboard/MultitapInputMethod 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         Property { name: "multitapSequence"; type: "string" }
@@ -1693,8 +1660,8 @@ Module {
     }
     Component {
         prototype: "QVirtualKeyboardAbstractInputMethod"
-        name: "QtQuick.VirtualKeyboard/MultitapInputMethod 1.0"
-        exports: ["QtQuick.VirtualKeyboard/MultitapInputMethod 1.0"]
+        name: "QtQuick.VirtualKeyboard/MultitapInputMethod 2.0"
+        exports: ["QtQuick.VirtualKeyboard/MultitapInputMethod 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         Property { name: "multitapSequence"; type: "string" }
@@ -1759,8 +1726,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/NumberKey 1.0"
-        exports: ["QtQuick.VirtualKeyboard/NumberKey 1.0"]
+        name: "QtQuick.VirtualKeyboard/NumberKey 2.0"
+        exports: ["QtQuick.VirtualKeyboard/NumberKey 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -1788,8 +1755,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/NumberKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/NumberKey 2.0"]
+        name: "QtQuick.VirtualKeyboard/NumberKey 1.0"
+        exports: ["QtQuick.VirtualKeyboard/NumberKey 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -1898,8 +1865,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/SpaceKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/SpaceKey 2.0"]
+        name: "QtQuick.VirtualKeyboard/SpaceKey 1.0"
+        exports: ["QtQuick.VirtualKeyboard/SpaceKey 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -1927,8 +1894,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/SpaceKey 1.0"
-        exports: ["QtQuick.VirtualKeyboard/SpaceKey 1.0"]
+        name: "QtQuick.VirtualKeyboard/SpaceKey 2.0"
+        exports: ["QtQuick.VirtualKeyboard/SpaceKey 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -1956,8 +1923,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/SymbolModeKey 2.0"
-        exports: ["QtQuick.VirtualKeyboard/SymbolModeKey 2.0"]
+        name: "QtQuick.VirtualKeyboard/SymbolModeKey 1.0"
+        exports: ["QtQuick.VirtualKeyboard/SymbolModeKey 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
@@ -1985,8 +1952,8 @@ Module {
     }
     Component {
         prototype: "QQuickItem"
-        name: "QtQuick.VirtualKeyboard/SymbolModeKey 1.0"
-        exports: ["QtQuick.VirtualKeyboard/SymbolModeKey 1.0"]
+        name: "QtQuick.VirtualKeyboard/SymbolModeKey 2.0"
+        exports: ["QtQuick.VirtualKeyboard/SymbolModeKey 2.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
diff --git a/src/import/qtquickvirtualkeyboardplugin.cpp b/src/import/qtquickvirtualkeyboardplugin.cpp
index 2b3f08c4..969884c2 100644
--- a/src/import/qtquickvirtualkeyboardplugin.cpp
+++ b/src/import/qtquickvirtualkeyboardplugin.cpp
@@ -144,6 +144,9 @@ void QtQuickVirtualKeyboardPlugin::registerTypes(const char *uri)
     qmlRegisterType(QUrl(componentsPath + QLatin1String("PopupList.qml")), uri, 2, 3, "PopupList");
     qmlRegisterType(QUrl(componentsPath + QLatin1String("SelectionControl.qml")), uri, 2, 1, "SelectionControl");
     qmlRegisterType(QUrl(componentsPath + QLatin1String("InputModeKey.qml")), uri, 2, 3, "InputModeKey");
+
+    // New revisions in 5.12.
+    qmlRegisterSingletonType<QVirtualKeyboardInputContext>(uri, 2, 4, "InputContext", createInputContextModule);
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/t9write/plugin/t9writeinputmethod.cpp b/src/plugins/t9write/plugin/t9writeinputmethod.cpp
index 63647e85..5ea1fd42 100644
--- a/src/plugins/t9write/plugin/t9writeinputmethod.cpp
+++ b/src/plugins/t9write/plugin/t9writeinputmethod.cpp
@@ -1354,7 +1354,7 @@ public:
                 QVariantMap result = resultList.at(i).toMap();
                 QString resultChars = result[QLatin1String("chars")].toString();
                 if (i == 0) {
-                    if (ic->shift()) {
+                    if (ic->isShiftActive()) {
                         caseFormatter.ensureLength(1, textCase);
                         caseFormatter.ensureLength(resultChars.length(), QVirtualKeyboardInputEngine::TextCase::Lower);
                     } else {
diff --git a/src/styles/TraceUtils.js b/src/styles/TraceUtils.js
index f2dd9bbb..c02ce5e9 100644
--- a/src/styles/TraceUtils.js
+++ b/src/styles/TraceUtils.js
@@ -74,7 +74,7 @@ function renderSmoothedLine(ctx, trace, renderPos) {
     }
 
     // Draw the remainder of the line
-    if (trace.isFinal) {
+    if (trace.final) {
         if (i < points.length) {
             tp = points[i - 1]
             ctx.beginPath()
diff --git a/src/virtualkeyboard/content/components/ShiftKey.qml b/src/virtualkeyboard/content/components/ShiftKey.qml
index 93a1ae58..d31a601a 100644
--- a/src/virtualkeyboard/content/components/ShiftKey.qml
+++ b/src/virtualkeyboard/content/components/ShiftKey.qml
@@ -45,7 +45,7 @@ BaseKey {
     id: shiftKey
     key: Qt.Key_Shift
     enabled: InputContext.priv.shiftHandler.toggleShiftEnabled
-    highlighted: InputContext.capsLock
+    highlighted: InputContext.capsLockActive
     functionKey: true
     keyPanelDelegate: keyboard.style ? keyboard.style.shiftKeyPanel : undefined
     onClicked: InputContext.priv.shiftHandler.toggleShift()
diff --git a/src/virtualkeyboard/content/components/TraceInputArea.qml b/src/virtualkeyboard/content/components/TraceInputArea.qml
index 2cfcd5dd..10527861 100644
--- a/src/virtualkeyboard/content/components/TraceInputArea.qml
+++ b/src/virtualkeyboard/content/components/TraceInputArea.qml
@@ -165,7 +165,7 @@ MultiPointTouchArea {
         for (var i = 0; i < touchPoints.length; i++) {
             var traceCanvas = findTraceCanvasById(touchPoints[i].pointId)
             if (traceCanvas) {
-                traceCanvas.trace.isFinal = true
+                traceCanvas.trace.final = true
                 __traceCanvasList.splice(__traceCanvasList.indexOf(traceCanvas), 1)
                 InputContext.inputEngine.traceEnd(traceCanvas.trace)
             }
@@ -176,8 +176,8 @@ MultiPointTouchArea {
         for (var i = 0; i < touchPoints.length; i++) {
             var traceCanvas = findTraceCanvasById(touchPoints[i].pointId)
             if (traceCanvas) {
-                traceCanvas.trace.isFinal = true
-                traceCanvas.trace.isCanceled = true
+                traceCanvas.trace.final = true
+                traceCanvas.trace.canceled = true
                 __traceCanvasList.splice(__traceCanvasList.indexOf(traceCanvas), 1)
                 InputContext.inputEngine.traceEnd(traceCanvas.trace)
             }
diff --git a/src/virtualkeyboard/content/layouts/ar_AR/main.qml b/src/virtualkeyboard/content/layouts/ar_AR/main.qml
index 6c2b78c4..a7f0e5b9 100644
--- a/src/virtualkeyboard/content/layouts/ar_AR/main.qml
+++ b/src/virtualkeyboard/content/layouts/ar_AR/main.qml
@@ -32,7 +32,7 @@ import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayoutLoader {
     inputMode: InputEngine.InputMode.Arabic
-    sourceComponent: InputContext.shift ? page2 : page1
+    sourceComponent: InputContext.shiftActive ? page2 : page1
     Component {
         id: page1
         KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/fa_FA/main.qml b/src/virtualkeyboard/content/layouts/fa_FA/main.qml
index fb5280f3..0450c772 100644
--- a/src/virtualkeyboard/content/layouts/fa_FA/main.qml
+++ b/src/virtualkeyboard/content/layouts/fa_FA/main.qml
@@ -32,7 +32,7 @@ import QtQuick.VirtualKeyboard 2.3
 
 KeyboardLayoutLoader {
     inputMode: InputEngine.InputMode.Arabic
-    sourceComponent: InputContext.shift ? page2 : page1
+    sourceComponent: InputContext.shiftActive ? page2 : page1
     Component {
         id: page1
         KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/hi_IN/main.qml b/src/virtualkeyboard/content/layouts/hi_IN/main.qml
index b4b1819e..aac186eb 100644
--- a/src/virtualkeyboard/content/layouts/hi_IN/main.qml
+++ b/src/virtualkeyboard/content/layouts/hi_IN/main.qml
@@ -32,7 +32,7 @@ import QtQuick.VirtualKeyboard 2.1
 
 KeyboardLayoutLoader {
     inputMode: InputEngine.InputMode.Latin
-    sourceComponent: InputContext.shift ? page2 : page1
+    sourceComponent: InputContext.shiftActive ? page2 : page1
     Component {
         id: page1
         KeyboardLayout {
diff --git a/src/virtualkeyboard/content/layouts/ko_KR/main.qml b/src/virtualkeyboard/content/layouts/ko_KR/main.qml
index cb7b567f..54e6ec57 100644
--- a/src/virtualkeyboard/content/layouts/ko_KR/main.qml
+++ b/src/virtualkeyboard/content/layouts/ko_KR/main.qml
@@ -34,7 +34,7 @@ KeyboardLayoutLoader {
     function createInputMethod() {
         return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.1; HangulInputMethod {}', parent, "hangulInputMethod")
     }
-    sourceComponent: InputContext.shift ? page2 : page1
+    sourceComponent: InputContext.shiftActive ? page2 : page1
     sharedLayouts: ['symbols']
     Component {
         id: page1
diff --git a/src/virtualkeyboard/content/layouts/th_TH/main.qml b/src/virtualkeyboard/content/layouts/th_TH/main.qml
index f3448c4f..60a8ebc0 100644
--- a/src/virtualkeyboard/content/layouts/th_TH/main.qml
+++ b/src/virtualkeyboard/content/layouts/th_TH/main.qml
@@ -37,7 +37,7 @@ KeyboardLayoutLoader {
         return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard.Plugins 2.3; ThaiInputMethod {}', parent, "thaiInputMethod")
     }
     sharedLayouts: [ "symbols" ]
-    sourceComponent: InputContext.shift ? page2 : page1
+    sourceComponent: InputContext.shiftActive ? page2 : page1
     Component {
         id: page1
         KeyboardLayout {
diff --git a/src/virtualkeyboard/content/styles/default/style.qml b/src/virtualkeyboard/content/styles/default/style.qml
index d8261b96..d561ac28 100644
--- a/src/virtualkeyboard/content/styles/default/style.qml
+++ b/src/virtualkeyboard/content/styles/default/style.qml
@@ -382,8 +382,8 @@ KeyboardStyle {
             }
             states: [
                 State {
-                    name: "capslock"
-                    when: InputContext.capsLock
+                    name: "capsLockActive"
+                    when: InputContext.capsLockActive
                     PropertyChanges {
                         target: shiftKeyBackground
                         color: "#5a892e"
@@ -394,8 +394,8 @@ KeyboardStyle {
                     }
                 },
                 State {
-                    name: "shift"
-                    when: InputContext.shift
+                    name: "shiftActive"
+                    when: InputContext.shiftActive
                     PropertyChanges {
                         target: shiftKeyIcon
                         source: resourcePrefix + "images/shift-80c342.svg"
@@ -805,9 +805,9 @@ KeyboardStyle {
                     weight: Font.Normal
                     pixelSize: 44 * scaleHint
                     capitalization: {
-                        if (InputContext.capsLock)
+                        if (InputContext.capsLockActive)
                             return Font.AllUppercase
-                        if (InputContext.shift)
+                        if (InputContext.shiftActive)
                             return Font.MixedCase
                         return Font.AllLowercase
                     }
diff --git a/src/virtualkeyboard/content/styles/retro/style.qml b/src/virtualkeyboard/content/styles/retro/style.qml
index 88d5fb8b..eb640783 100644
--- a/src/virtualkeyboard/content/styles/retro/style.qml
+++ b/src/virtualkeyboard/content/styles/retro/style.qml
@@ -420,8 +420,8 @@ KeyboardStyle {
             scale: (parent.height - 2 * keyBackgroundMargin) / sourceSize.height
             states: [
                 State {
-                    name: "capslock"
-                    when: InputContext.capsLock
+                    name: "capsLockActive"
+                    when: InputContext.capsLockActive
                     PropertyChanges {
                         target: shiftKeyBackground
                         source: resourcePrefix + "images/key154px_capslock.png"
@@ -432,8 +432,8 @@ KeyboardStyle {
                     }
                 },
                 State {
-                    name: "shift"
-                    when: InputContext.shift
+                    name: "shiftActive"
+                    when: InputContext.shiftActive
                     PropertyChanges {
                         target: shiftKeyBackground
                         source: resourcePrefix + "images/key154px_shiftcase.png"
@@ -918,9 +918,9 @@ KeyboardStyle {
                 weight: Font.Bold
                 pixelSize: 72 * scaleHint
                 capitalization: {
-                    if (InputContext.capsLock)
+                    if (InputContext.capsLockActive)
                         return Font.AllUppercase
-                    if (InputContext.shift)
+                    if (InputContext.shiftActive)
                         return Font.MixedCase
                     return Font.AllLowercase
                 }
diff --git a/src/virtualkeyboard/desktopinputselectioncontrol.cpp b/src/virtualkeyboard/desktopinputselectioncontrol.cpp
index d5ec79d3..196ab512 100644
--- a/src/virtualkeyboard/desktopinputselectioncontrol.cpp
+++ b/src/virtualkeyboard/desktopinputselectioncontrol.cpp
@@ -115,7 +115,7 @@ void DesktopInputSelectionControl::updateVisibility()
     }
     const bool wasAnchorVisible = m_anchorHandleVisible;
     const bool wasCursorVisible = m_cursorHandleVisible;
-    const bool makeVisible = (m_inputContext->selectionControlVisible() || m_handleState == HandleIsMoving) && m_enabled;
+    const bool makeVisible = (m_inputContext->isSelectionControlVisible() || m_handleState == HandleIsMoving) && m_enabled;
 
     m_anchorHandleVisible = makeVisible;
     if (QWindow *focusWindow = QGuiApplication::focusWindow()) {
diff --git a/src/virtualkeyboard/platforminputcontext.cpp b/src/virtualkeyboard/platforminputcontext.cpp
index 24b70f35..736af37c 100644
--- a/src/virtualkeyboard/platforminputcontext.cpp
+++ b/src/virtualkeyboard/platforminputcontext.cpp
@@ -125,7 +125,7 @@ QRectF PlatformInputContext::keyboardRect() const
 
 bool PlatformInputContext::isAnimating() const
 {
-    return m_inputContext ? m_inputContext->animating() : false;
+    return m_inputContext ? m_inputContext->isAnimating() : false;
 }
 
 void PlatformInputContext::showInputPanel()
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp
index 9e684c3b..6fc6c1c3 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp
@@ -73,8 +73,8 @@ QVirtualKeyboardInputContext::QVirtualKeyboardInputContext(QObject *parent) :
 {
     Q_D(QVirtualKeyboardInputContext);
     d->init();
-    QObject::connect(d->_shiftHandler, &ShiftHandler::shiftChanged, this, &QVirtualKeyboardInputContext::shiftChanged);
-    QObject::connect(d->_shiftHandler, &ShiftHandler::capsLockChanged, this, &QVirtualKeyboardInputContext::capsLockChanged);
+    QObject::connect(d->_shiftHandler, &ShiftHandler::shiftActiveChanged, this, &QVirtualKeyboardInputContext::shiftActiveChanged);
+    QObject::connect(d->_shiftHandler, &ShiftHandler::capsLockActiveChanged, this, &QVirtualKeyboardInputContext::capsLockActiveChanged);
     QObject::connect(d->_shiftHandler, &ShiftHandler::uppercaseChanged, this, &QVirtualKeyboardInputContext::uppercaseChanged);
     QObject::connect(d, &QVirtualKeyboardInputContextPrivate::localeChanged, this, &QVirtualKeyboardInputContext::localeChanged);
 }
@@ -87,22 +87,22 @@ QVirtualKeyboardInputContext::~QVirtualKeyboardInputContext()
 {
 }
 
-bool QVirtualKeyboardInputContext::shift() const
+bool QVirtualKeyboardInputContext::isShiftActive() const
 {
     Q_D(const QVirtualKeyboardInputContext);
-    return d->_shiftHandler->shift();
+    return d->_shiftHandler->isShiftActive();
 }
 
-bool QVirtualKeyboardInputContext::capsLock() const
+bool QVirtualKeyboardInputContext::isCapsLockActive() const
 {
     Q_D(const QVirtualKeyboardInputContext);
-    return d->_shiftHandler->capsLock();
+    return d->_shiftHandler->isCapsLockActive();
 }
 
-bool QVirtualKeyboardInputContext::uppercase() const
+bool QVirtualKeyboardInputContext::isUppercase() const
 {
     Q_D(const QVirtualKeyboardInputContext);
-    return d->_shiftHandler->uppercase();
+    return d->_shiftHandler->isUppercase();
 }
 
 int QVirtualKeyboardInputContext::anchorPosition() const
@@ -176,7 +176,7 @@ QRectF QVirtualKeyboardInputContext::cursorRectangle() const
     return d->cursorRectangle;
 }
 
-bool QVirtualKeyboardInputContext::animating() const
+bool QVirtualKeyboardInputContext::isAnimating() const
 {
     Q_D(const QVirtualKeyboardInputContext);
     return d->animating;
@@ -338,7 +338,7 @@ bool QVirtualKeyboardInputContext::cursorRectIntersectsClipRect() const
     return d->cursorRectIntersectsClipRect;
 }
 
-bool QVirtualKeyboardInputContext::selectionControlVisible() const
+bool QVirtualKeyboardInputContext::isSelectionControlVisible() const
 {
     Q_D(const QVirtualKeyboardInputContext);
     return d->selectionControlVisible;
@@ -352,6 +352,7 @@ QVirtualKeyboardInputContextPrivate *QVirtualKeyboardInputContext::priv() const
 
 /*!
     \qmlproperty bool InputContext::shift
+    \deprecated Use \l shiftActive instead.
 
     This property is changed when the shift status changes.
 */
@@ -359,12 +360,28 @@ QVirtualKeyboardInputContextPrivate *QVirtualKeyboardInputContext::priv() const
 /*!
     \property QVirtualKeyboardInputContext::shift
     \brief the shift status.
+    \deprecated Use \l shiftActive instead.
+
+    This property is changed when the shift status changes.
+*/
+
+/*!
+    \qmlproperty bool InputContext::shiftActive
+    \since QtQuick.VirtualKeyboard 2.4
+
+    This property is changed when the shift status changes.
+*/
+
+/*!
+    \property QVirtualKeyboardInputContext::shiftActive
+    \brief the shift status.
 
     This property is changed when the shift status changes.
 */
 
 /*!
     \qmlproperty bool InputContext::capsLock
+    \deprecated Use \l capsLockActive instead.
 
     This property is changed when the caps lock status changes.
 */
@@ -372,6 +389,21 @@ QVirtualKeyboardInputContextPrivate *QVirtualKeyboardInputContext::priv() const
 /*!
     \property QVirtualKeyboardInputContext::capsLock
     \brief the caps lock status.
+    \deprecated Use \l capsLockActive instead.
+
+    This property is changed when the caps lock status changes.
+*/
+
+/*!
+    \qmlproperty bool InputContext::capsLockActive
+    \since QtQuick.VirtualKeyboard 2.4
+
+    This property is changed when the caps lock status changes.
+*/
+
+/*!
+    \property QVirtualKeyboardInputContext::capsLockActive
+    \brief the caps lock status.
 
     This property is changed when the caps lock status changes.
 */
@@ -380,14 +412,14 @@ QVirtualKeyboardInputContextPrivate *QVirtualKeyboardInputContext::priv() const
     \qmlproperty bool InputContext::uppercase
     \since QtQuick.VirtualKeyboard 2.2
 
-    This property is \c true when either \l shift or \l capsLock is \c true.
+    This property is \c true when either \l shiftActive or \l capsLockActive is \c true.
 */
 
 /*!
     \property QVirtualKeyboardInputContext::uppercase
     \brief the uppercase status.
 
-    This property is \c true when either \l shift or \l capsLock is \c true.
+    This property is \c true when either \l shiftActive or \l capsLockActive is \c true.
 */
 
 /*!
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext.h b/src/virtualkeyboard/qvirtualkeyboardinputcontext.h
index ac061c2b..f55d8cae 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputcontext.h
+++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext.h
@@ -50,9 +50,11 @@ class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardInputContext : public QObject
     Q_OBJECT
     Q_DISABLE_COPY(QVirtualKeyboardInputContext)
     Q_DECLARE_PRIVATE(QVirtualKeyboardInputContext)
-    Q_PROPERTY(bool shift READ shift NOTIFY shiftChanged)
-    Q_PROPERTY(bool capsLock READ capsLock NOTIFY capsLockChanged)
-    Q_PROPERTY(bool uppercase READ uppercase NOTIFY uppercaseChanged)
+    Q_PROPERTY(bool shift READ isShiftActive NOTIFY shiftActiveChanged)
+    Q_PROPERTY(bool shiftActive READ isShiftActive NOTIFY shiftActiveChanged REVISION 4)
+    Q_PROPERTY(bool capsLock READ isCapsLockActive NOTIFY capsLockActiveChanged)
+    Q_PROPERTY(bool capsLockActive READ isCapsLockActive NOTIFY capsLockActiveChanged REVISION 4)
+    Q_PROPERTY(bool uppercase READ isUppercase NOTIFY uppercaseChanged)
     Q_PROPERTY(int anchorPosition READ anchorPosition NOTIFY anchorPositionChanged)
     Q_PROPERTY(int cursorPosition READ cursorPosition NOTIFY cursorPositionChanged)
     Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints NOTIFY inputMethodHintsChanged)
@@ -61,10 +63,10 @@ class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardInputContext : public QObject
     Q_PROPERTY(QString selectedText READ selectedText NOTIFY selectedTextChanged)
     Q_PROPERTY(QRectF anchorRectangle READ anchorRectangle NOTIFY anchorRectangleChanged)
     Q_PROPERTY(QRectF cursorRectangle READ cursorRectangle NOTIFY cursorRectangleChanged)
-    Q_PROPERTY(bool animating READ animating WRITE setAnimating NOTIFY animatingChanged)
+    Q_PROPERTY(bool animating READ isAnimating WRITE setAnimating NOTIFY animatingChanged)
     Q_PROPERTY(QString locale READ locale NOTIFY localeChanged)
     Q_PROPERTY(QVirtualKeyboardInputEngine *inputEngine READ inputEngine CONSTANT)
-    Q_PROPERTY(bool selectionControlVisible READ selectionControlVisible NOTIFY selectionControlVisibleChanged)
+    Q_PROPERTY(bool selectionControlVisible READ isSelectionControlVisible NOTIFY selectionControlVisibleChanged)
     Q_PROPERTY(bool anchorRectIntersectsClipRect READ anchorRectIntersectsClipRect NOTIFY anchorRectIntersectsClipRectChanged)
     Q_PROPERTY(bool cursorRectIntersectsClipRect READ cursorRectIntersectsClipRect NOTIFY cursorRectIntersectsClipRectChanged)
     Q_PROPERTY(QVirtualKeyboardInputContextPrivate *priv READ priv CONSTANT)
@@ -73,9 +75,9 @@ public:
     explicit QVirtualKeyboardInputContext(QObject *parent = nullptr);
     ~QVirtualKeyboardInputContext();
 
-    bool shift() const;
-    bool capsLock() const;
-    bool uppercase() const;
+    bool isShiftActive() const;
+    bool isCapsLockActive() const;
+    bool isUppercase() const;
     int anchorPosition() const;
     int cursorPosition() const;
     Qt::InputMethodHints inputMethodHints() const;
@@ -86,11 +88,11 @@ public:
     QString selectedText() const;
     QRectF anchorRectangle() const;
     QRectF cursorRectangle() const;
-    bool animating() const;
-    void setAnimating(bool animating);
+    bool isAnimating() const;
+    void setAnimating(bool isAnimating);
     QString locale() const;
     QVirtualKeyboardInputEngine *inputEngine() const;
-    bool selectionControlVisible() const;
+    bool isSelectionControlVisible() const;
     bool anchorRectIntersectsClipRect() const;
     bool cursorRectIntersectsClipRect() const;
     QVirtualKeyboardInputContextPrivate *priv() const;
@@ -112,8 +114,8 @@ Q_SIGNALS:
     void cursorPositionChanged();
     void anchorRectangleChanged();
     void cursorRectangleChanged();
-    void shiftChanged();
-    void capsLockChanged();
+    void shiftActiveChanged();
+    void capsLockActiveChanged();
     void uppercaseChanged();
     void animatingChanged();
     void localeChanged();
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp b/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp
index 82f2fe8f..ddc793bf 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp
@@ -162,7 +162,7 @@ void QVirtualKeyboardInputEngine::init()
 {
     Q_D(QVirtualKeyboardInputEngine);
     ShiftHandler *shiftHandler = d->inputContext->priv()->shiftHandler();
-    QObject::connect(shiftHandler, &ShiftHandler::shiftChanged, this, &QVirtualKeyboardInputEngine::shiftChanged);
+    QObject::connect(shiftHandler, &ShiftHandler::shiftActiveChanged, this, &QVirtualKeyboardInputEngine::shiftChanged);
     QObject::connect(d->inputContext, &QVirtualKeyboardInputContext::localeChanged, this, &QVirtualKeyboardInputEngine::update);
     QObject::connect(d->inputContext, &QVirtualKeyboardInputContext::inputMethodHintsChanged, this, &QVirtualKeyboardInputEngine::updateSelectionListModels);
     QObject::connect(d->inputContext, &QVirtualKeyboardInputContext::localeChanged, this, &QVirtualKeyboardInputEngine::updateInputModes);
@@ -625,7 +625,7 @@ void QVirtualKeyboardInputEngine::update()
 void QVirtualKeyboardInputEngine::shiftChanged()
 {
     Q_D(QVirtualKeyboardInputEngine);
-    TextCase newCase = d->inputContext->priv()->shiftHandler()->shift() ? TextCase::Upper : TextCase::Lower;
+    TextCase newCase = d->inputContext->priv()->shiftHandler()->isShiftActive() ? TextCase::Upper : TextCase::Lower;
     if (d->textCase != newCase) {
         d->textCase = newCase;
         if (d->inputMethod) {
diff --git a/src/virtualkeyboard/qvirtualkeyboardtrace.cpp b/src/virtualkeyboard/qvirtualkeyboardtrace.cpp
index 82d61464..4f29d0ea 100644
--- a/src/virtualkeyboard/qvirtualkeyboardtrace.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardtrace.cpp
@@ -258,7 +258,7 @@ QVariantList QVirtualKeyboardTrace::points(int pos, int count) const
     Adds a \a point to the Trace.
 
     The method returns index of the point added, or -1 if
-    the points cannot be added (i.e. the isFinal is true).
+    the points cannot be added (i.e. the \l final is true).
 
     \note The returned index is required to associate additional
     data with the point using the setChannelData() function.
@@ -267,7 +267,7 @@ QVariantList QVirtualKeyboardTrace::points(int pos, int count) const
 /*! Adds a \a point to the QVirtualKeyboardTrace.
 
     The method returns index of the point added, or -1 if
-    the points cannot be added (i.e. the isFinal is true).
+    the points cannot be added (i.e. the \l final is true).
 
     \note The returned index is required to associate additional
     data with the point using the setChannelData() method.
@@ -416,29 +416,29 @@ void QVirtualKeyboardTrace::setOpacity(qreal opacity)
     \brief the number of of points in the QVirtualKeyboardTrace.
 */
 
-/*! \qmlproperty bool Trace::isFinal
+/*! \qmlproperty bool Trace::final
 
     This property defines whether the Trace can accept more data.
-    If the value is true, no more data is accepted.
+    If the value is \c true, no more data is accepted.
 */
 
-/*! \property QVirtualKeyboardTrace::isFinal
+/*! \property QVirtualKeyboardTrace::final
     \brief defines whether the QVirtualKeyboardTrace can accept more data.
-    If the value is true, no more data is accepted.
+    If the value is \c true, no more data is accepted.
 */
 
-/*! \qmlproperty bool Trace::isCanceled
+/*! \qmlproperty bool Trace::canceled
 
     This property defines whether the Trace is canceled.
     The input data should not be processed from the Traces
-    whose isCanceled property set to true.
+    whose \c canceled property set to true.
 */
 
-/*! \property QVirtualKeyboardTrace::isCanceled
+/*! \property QVirtualKeyboardTrace::canceled
     \brief defines whether the QVirtualKeyboardTrace is canceled.
 
     The input data should not be processed from the Traces
-    whose isCanceled property set to true.
+    whose \c canceled property set to true.
 */
 
 /*! \qmlproperty qreal Trace::opacity
diff --git a/src/virtualkeyboard/qvirtualkeyboardtrace.h b/src/virtualkeyboard/qvirtualkeyboardtrace.h
index 55272ebe..18544742 100644
--- a/src/virtualkeyboard/qvirtualkeyboardtrace.h
+++ b/src/virtualkeyboard/qvirtualkeyboardtrace.h
@@ -46,8 +46,8 @@ class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardTrace : public QObject
     Q_PROPERTY(int traceId READ traceId WRITE setTraceId NOTIFY traceIdChanged)
     Q_PROPERTY(QStringList channels READ channels WRITE setChannels NOTIFY channelsChanged)
     Q_PROPERTY(int length READ length NOTIFY lengthChanged)
-    Q_PROPERTY(bool isFinal READ isFinal WRITE setFinal NOTIFY finalChanged)
-    Q_PROPERTY(bool isCanceled READ isCanceled WRITE setCanceled NOTIFY canceledChanged)
+    Q_PROPERTY(bool final READ isFinal WRITE setFinal NOTIFY finalChanged)
+    Q_PROPERTY(bool canceled READ isCanceled WRITE setCanceled NOTIFY canceledChanged)
     Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged)
 public:
     explicit QVirtualKeyboardTrace(QObject *parent = nullptr);
diff --git a/src/virtualkeyboard/shadowinputcontext.cpp b/src/virtualkeyboard/shadowinputcontext.cpp
index 29ac5dfb..dc49f513 100644
--- a/src/virtualkeyboard/shadowinputcontext.cpp
+++ b/src/virtualkeyboard/shadowinputcontext.cpp
@@ -159,7 +159,7 @@ void ShadowInputContext::updateSelectionProperties()
     const QRectF inputItemClipRect = imQueryEvent.value(Qt::ImInputItemClipRectangle).toRectF();
     const bool anchorRectIntersectsClipRect = inputItemClipRect.intersects(anchorRect);
     const bool cursorRectIntersectsClipRect = inputItemClipRect.intersects(cursorRect);
-    const bool selectionControlVisible = d->inputContext->selectionControlVisible();
+    const bool selectionControlVisible = d->inputContext->isSelectionControlVisible();
 
     const bool newAnchorRectangle = anchorRectangle != d->anchorRectangle;
     const bool newCursorRectangle = cursorRectangle != d->cursorRectangle;
diff --git a/src/virtualkeyboard/shifthandler.cpp b/src/virtualkeyboard/shifthandler.cpp
index badb6a04..ab37ee21 100644
--- a/src/virtualkeyboard/shifthandler.cpp
+++ b/src/virtualkeyboard/shifthandler.cpp
@@ -136,54 +136,54 @@ void ShiftHandler::setSentenceEndingCharacters(const QString &value)
     }
 }
 
-bool ShiftHandler::autoCapitalizationEnabled() const
+bool ShiftHandler::isAutoCapitalizationEnabled() const
 {
     Q_D(const ShiftHandler);
     return d->autoCapitalizationEnabled;
 }
 
-bool ShiftHandler::toggleShiftEnabled() const
+bool ShiftHandler::isToggleShiftEnabled() const
 {
     Q_D(const ShiftHandler);
     return d->toggleShiftEnabled;
 }
 
-bool ShiftHandler::shift() const
+bool ShiftHandler::isShiftActive() const
 {
     Q_D(const ShiftHandler);
     return d->shift;
 }
 
-void ShiftHandler::setShift(bool enable)
+void ShiftHandler::setShiftActive(bool active)
 {
     Q_D(ShiftHandler);
-    if (d->shift != enable) {
-        d->shift = enable;
+    if (d->shift != active) {
+        d->shift = active;
         d->shiftChanged = true;
-        emit shiftChanged();
+        emit shiftActiveChanged();
         if (!d->capsLock)
             emit uppercaseChanged();
     }
 }
 
-bool ShiftHandler::capsLock() const
+bool ShiftHandler::isCapsLockActive() const
 {
     Q_D(const ShiftHandler);
     return d->capsLock;
 }
 
-void ShiftHandler::setCapsLock(bool enable)
+void ShiftHandler::setCapsLockActive(bool active)
 {
     Q_D(ShiftHandler);
-    if (d->capsLock != enable) {
-        d->capsLock = enable;
-        emit capsLockChanged();
+    if (d->capsLock != active) {
+        d->capsLock = active;
+        emit capsLockActiveChanged();
         if (!d->shift)
             emit uppercaseChanged();
     }
 }
 
-bool ShiftHandler::uppercase() const
+bool ShiftHandler::isUppercase() const
 {
     Q_D(const ShiftHandler);
     return d->shift || d->capsLock;
@@ -217,16 +217,16 @@ void ShiftHandler::toggleShift()
     if (!d->toggleShiftEnabled)
         return;
     if (d->manualShiftLanguageFilter.contains(d->locale.language())) {
-        setCapsLock(false);
-        setShift(!d->shift);
+        setCapsLockActive(false);
+        setShiftActive(!d->shift);
     } else if (d->inputContext->inputMethodHints() & Qt::ImhNoAutoUppercase ||
                d->manualCapsInputModeFilter.contains(d->inputContext->inputEngine()->inputMode())) {
         bool capsLock = d->capsLock;
-        setCapsLock(!capsLock);
-        setShift(!capsLock);
+        setCapsLockActive(!capsLock);
+        setShiftActive(!capsLock);
     } else {
         if (d->capsLock) {
-            setCapsLock(!d->capsLock && d->shift && !d->shiftChanged);
+            setCapsLockActive(!d->capsLock && d->shift && !d->shiftChanged);
         }
 
         QStyleHints *style = QGuiApplication::styleHints();
@@ -234,10 +234,10 @@ void ShiftHandler::toggleShift()
         if (d->timer.isNull() || d->timer.elapsed() > style->mouseDoubleClickInterval()) {
             d->timer.restart();
         } else if (d->timer.elapsed() < style->mouseDoubleClickInterval() && !d->capsLock) {
-            setCapsLock(!d->capsLock && d->shift && !d->shiftChanged);
+            setCapsLockActive(!d->capsLock && d->shift && !d->shiftChanged);
         }
 
-        setShift(d->capsLock || !d->shift);
+        setShiftActive(d->capsLock || !d->shift);
         d->shiftChanged = false;
     }
 }
@@ -278,9 +278,9 @@ void ShiftHandler::reset()
         }
         setToggleShiftEnabled(toggleShiftEnabled);
         setAutoCapitalizationEnabled(autoCapitalizationEnabled);
-        setCapsLock(preferUpperCase);
+        setCapsLockActive(preferUpperCase);
         if (preferUpperCase)
-            setShift(preferUpperCase);
+            setShiftActive(preferUpperCase);
         else
             autoCapitalize();
     }
@@ -292,22 +292,22 @@ void ShiftHandler::autoCapitalize()
     if (d->capsLock)
         return;
     if (!d->autoCapitalizationEnabled || !d->inputContext->preeditText().isEmpty()) {
-        setShift(false);
+        setShiftActive(false);
     } else {
         int cursorPosition = d->inputContext->cursorPosition();
         bool preferLowerCase = d->inputContext->inputMethodHints() & Qt::ImhPreferLowercase;
         if (cursorPosition == 0) {
-            setShift(!preferLowerCase);
+            setShiftActive(!preferLowerCase);
         } else {
             QString text = d->inputContext->surroundingText();
             text.truncate(cursorPosition);
             text = text.trimmed();
             if (text.length() == 0)
-                setShift(!preferLowerCase);
+                setShiftActive(!preferLowerCase);
             else if (text.length() > 0 && d->sentenceEndingCharacters.indexOf(text[text.length() - 1]) >= 0)
-                setShift(!preferLowerCase);
+                setShiftActive(!preferLowerCase);
             else
-                setShift(false);
+                setShiftActive(false);
         }
     }
 }
diff --git a/src/virtualkeyboard/shifthandler_p.h b/src/virtualkeyboard/shifthandler_p.h
index 0f2c6332..1dcce96c 100644
--- a/src/virtualkeyboard/shifthandler_p.h
+++ b/src/virtualkeyboard/shifthandler_p.h
@@ -59,11 +59,11 @@ class QVIRTUALKEYBOARD_EXPORT ShiftHandler : public QObject
     Q_DISABLE_COPY(ShiftHandler)
     Q_DECLARE_PRIVATE(ShiftHandler)
     Q_PROPERTY(QString sentenceEndingCharacters READ sentenceEndingCharacters WRITE setSentenceEndingCharacters NOTIFY sentenceEndingCharactersChanged)
-    Q_PROPERTY(bool autoCapitalizationEnabled READ autoCapitalizationEnabled NOTIFY autoCapitalizationEnabledChanged)
-    Q_PROPERTY(bool toggleShiftEnabled READ toggleShiftEnabled NOTIFY toggleShiftEnabledChanged)
-    Q_PROPERTY(bool shift READ shift WRITE setShift NOTIFY shiftChanged)
-    Q_PROPERTY(bool capsLock READ capsLock WRITE setCapsLock NOTIFY capsLockChanged)
-    Q_PROPERTY(bool uppercase READ uppercase NOTIFY uppercaseChanged)
+    Q_PROPERTY(bool autoCapitalizationEnabled READ isAutoCapitalizationEnabled NOTIFY autoCapitalizationEnabledChanged)
+    Q_PROPERTY(bool toggleShiftEnabled READ isToggleShiftEnabled NOTIFY toggleShiftEnabledChanged)
+    Q_PROPERTY(bool shiftActive READ isShiftActive WRITE setShiftActive NOTIFY shiftActiveChanged)
+    Q_PROPERTY(bool capsLockActive READ isCapsLockActive WRITE setCapsLockActive NOTIFY capsLockActiveChanged)
+    Q_PROPERTY(bool uppercase READ isUppercase NOTIFY uppercaseChanged)
 
     explicit ShiftHandler(QVirtualKeyboardInputContext *parent = nullptr);
     void init();
@@ -73,13 +73,13 @@ public:
 
     QString sentenceEndingCharacters() const;
     void setSentenceEndingCharacters(const QString &value);
-    bool autoCapitalizationEnabled() const;
-    bool toggleShiftEnabled() const;
-    bool shift() const;
-    void setShift(bool enable);
-    bool capsLock() const;
-    void setCapsLock(bool enable);
-    bool uppercase() const;
+    bool isAutoCapitalizationEnabled() const;
+    bool isToggleShiftEnabled() const;
+    bool isShiftActive() const;
+    void setShiftActive(bool active);
+    bool isCapsLockActive() const;
+    void setCapsLockActive(bool active);
+    bool isUppercase() const;
 
     Q_INVOKABLE void toggleShift();
     Q_INVOKABLE void clearToggleShiftTimer();
@@ -88,8 +88,8 @@ signals:
     void sentenceEndingCharactersChanged();
     void toggleShiftEnabledChanged();
     void autoCapitalizationEnabledChanged();
-    void shiftChanged();
-    void capsLockChanged();
+    void shiftActiveChanged();
+    void capsLockActiveChanged();
     void uppercaseChanged();
 
 private slots:
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])