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>

2 files changed, 71 insertions, 101 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