From de0cd1ccce04d6ada9e61594941ee2ae119a35f0 Mon Sep 17 00:00:00 2001 From: Jarkko Koivikko Date: Wed, 30 Aug 2023 08:13:04 +0300 Subject: Fix QML revisioning This change adds the missing revisioning for various components: - QtQuick.VirtualKeyboard.Plugins 2.0: Must be version 2.0 because it is essential import. - QtQuick.VirtualKeyboard.Styles.Builtin 1.0: Must be version 1.0 since the dependent module QtQuick.VirtualKeyboard.Styles is also 1.0. - QtQuick.VirtualKeyboard 6.4: VirtualKeyboardFeatures namespace and QtVirtualKeyboard namespace were introduced at this version (Port qtvirtualkeyboard to declarative type registration). - QtQuick.VirtualKeyboard 2.0: Added PlainInputMethod element and InputContext.priv property at this revision. - QtQuick.VirtualKeyboard 2.4: Fix revisioning of InputContext.shiftActive and InputContext.capsLockActive properties, which were specified only with minor version 4 that is implicitly coupled to current major version 6. Specify revision 2.4 explicitly. Fixes: QTBUG-116432 Pick-to: 6.6 Change-Id: I8abe5652355a32afbf9659b8dd9e1d1fe0f358db Reviewed-by: Jarkko Koivikko Reviewed-by: Ulf Hermann Reviewed-by: Fabian Kosmale --- src/plugins/CMakeLists.txt | 1 + src/plugins/cerence/CMakeLists.txt | 1 + src/plugins/cerence/hwr/plugin/CMakeLists.txt | 1 + .../cerence/hwr/plugin/t9writeinputmethod_p.h | 1 + src/plugins/cerence/xt9/plugin/CMakeLists.txt | 1 + .../cerence/xt9/plugin/xt9awinputmethod_p.h | 2 + .../cerence/xt9/plugin/xt9cpinputmethod_p.h | 2 + src/plugins/cerence/xt9/plugin/xt9jinputmethod_p.h | 2 + src/plugins/cerence/xt9/plugin/xt9kinputmethod_p.h | 2 + .../cerence/xt9/plugin/xt9thaiinputmethod_p.h | 2 + src/plugins/example/CMakeLists.txt | 1 + src/plugins/example/hwr/CMakeLists.txt | 1 + src/plugins/example/hwr/examplehwrinputmethod_p.h | 1 + src/plugins/hangul/CMakeLists.txt | 1 + src/plugins/hangul/hangulinputmethod_p.h | 2 + src/plugins/hunspell/module/CMakeLists.txt | 1 + .../hunspell/module/hunspellinputmethod_p.h | 2 + src/plugins/myscript/plugin/CMakeLists.txt | 1 + .../myscript/plugin/myscriptinputmethod_p.h | 2 + src/plugins/openwnn/CMakeLists.txt | 1 + src/plugins/openwnn/openwnninputmethod_p.h | 1 + src/plugins/pinyin/CMakeLists.txt | 1 + src/plugins/pinyin/pinyininputmethod_p.h | 1 + src/plugins/tcime/CMakeLists.txt | 1 + src/plugins/tcime/tcinputmethod_p.h | 1 + src/plugins/thai/CMakeLists.txt | 1 + src/plugins/thai/thaiinputmethod_p.h | 2 + src/styles/builtin/CMakeLists.txt | 1 + src/virtualkeyboard/plaininputmethod_p.h | 1 + .../qvirtualkeyboardfeatures_namespace_p.h | 1 + src/virtualkeyboard/qvirtualkeyboardinputcontext.h | 6 +- src/virtualkeyboard/qvirtualkeyboardnamespace_p.h | 1 + src/virtualkeyboard/shadowinputcontext_p.h | 1 + tests/auto/inputpanel/data/tst_inputpanel.qml | 86 +++++++++++++--------- 34 files changed, 94 insertions(+), 39 deletions(-) diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index adacd194..4c76859d 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -42,6 +42,7 @@ endif() qt_internal_add_qml_module(qtvkbpluginsplugin URI "QtQuick.VirtualKeyboard.Plugins" VERSION "${PROJECT_VERSION}" + PAST_MAJOR_VERSIONS 2 PLUGIN_TARGET qtvkbpluginsplugin IMPORTS ${plugins_imports} diff --git a/src/plugins/cerence/CMakeLists.txt b/src/plugins/cerence/CMakeLists.txt index 29f4ee07..59568878 100644 --- a/src/plugins/cerence/CMakeLists.txt +++ b/src/plugins/cerence/CMakeLists.txt @@ -16,6 +16,7 @@ endif() qt_internal_add_qml_module(qtvkbcerenceplugin URI "QtQuick.VirtualKeyboard.Plugins.Cerence" VERSION "${PROJECT_VERSION}" + PAST_MAJOR_VERSIONS 2 PLUGIN_TARGET qtvkbcerenceplugin IMPORTS ${cerence_imports} diff --git a/src/plugins/cerence/hwr/plugin/CMakeLists.txt b/src/plugins/cerence/hwr/plugin/CMakeLists.txt index a23e5885..b0e4369f 100644 --- a/src/plugins/cerence/hwr/plugin/CMakeLists.txt +++ b/src/plugins/cerence/hwr/plugin/CMakeLists.txt @@ -8,6 +8,7 @@ qt_internal_add_qml_module(qtvkbcerencehwrplugin URI "QtQuick.VirtualKeyboard.Plugins.Cerence.HWR" VERSION "${PROJECT_VERSION}" + PAST_MAJOR_VERSIONS 2 PLUGIN_TARGET qtvkbcerencehwrplugin NO_PLUGIN_OPTIONAL DEPENDENCIES diff --git a/src/plugins/cerence/hwr/plugin/t9writeinputmethod_p.h b/src/plugins/cerence/hwr/plugin/t9writeinputmethod_p.h index fa103313..b8abb8d1 100644 --- a/src/plugins/cerence/hwr/plugin/t9writeinputmethod_p.h +++ b/src/plugins/cerence/hwr/plugin/t9writeinputmethod_p.h @@ -28,6 +28,7 @@ class T9WriteInputMethod : public QVirtualKeyboardAbstractInputMethod Q_OBJECT Q_DECLARE_PRIVATE(T9WriteInputMethod) QML_NAMED_ELEMENT(HandwritingInputMethod) + QML_ADDED_IN_VERSION(2, 0) public: enum class EngineMode { diff --git a/src/plugins/cerence/xt9/plugin/CMakeLists.txt b/src/plugins/cerence/xt9/plugin/CMakeLists.txt index 09bb2f72..94fad3b4 100644 --- a/src/plugins/cerence/xt9/plugin/CMakeLists.txt +++ b/src/plugins/cerence/xt9/plugin/CMakeLists.txt @@ -8,6 +8,7 @@ qt_internal_add_qml_module(qtvkbcerencext9plugin URI "QtQuick.VirtualKeyboard.Plugins.Cerence.XT9" VERSION "${PROJECT_VERSION}" + PAST_MAJOR_VERSIONS 2 PLUGIN_TARGET qtvkbcerencext9plugin NO_PLUGIN_OPTIONAL DEPENDENCIES diff --git a/src/plugins/cerence/xt9/plugin/xt9awinputmethod_p.h b/src/plugins/cerence/xt9/plugin/xt9awinputmethod_p.h index b1eaee3b..a2eb521b 100644 --- a/src/plugins/cerence/xt9/plugin/xt9awinputmethod_p.h +++ b/src/plugins/cerence/xt9/plugin/xt9awinputmethod_p.h @@ -16,6 +16,8 @@ class Xt9AwInputMethod : public Xt9InputMethod Q_OBJECT Q_DECLARE_PRIVATE(Xt9AwInputMethod) QML_NAMED_ELEMENT(DefaultInputMethod) + QML_ADDED_IN_VERSION(2, 0) + protected: Xt9AwInputMethod(Xt9AwInputMethodPrivate &dd, QObject *parent = nullptr); diff --git a/src/plugins/cerence/xt9/plugin/xt9cpinputmethod_p.h b/src/plugins/cerence/xt9/plugin/xt9cpinputmethod_p.h index 12df80a1..6486c662 100644 --- a/src/plugins/cerence/xt9/plugin/xt9cpinputmethod_p.h +++ b/src/plugins/cerence/xt9/plugin/xt9cpinputmethod_p.h @@ -16,6 +16,8 @@ class Xt9CpInputMethod : public Xt9InputMethod Q_OBJECT Q_DECLARE_PRIVATE(Xt9CpInputMethod) QML_NAMED_ELEMENT(PinyinInputMethod) + QML_ADDED_IN_VERSION(2, 0) + public: explicit Xt9CpInputMethod(QObject *parent = nullptr); diff --git a/src/plugins/cerence/xt9/plugin/xt9jinputmethod_p.h b/src/plugins/cerence/xt9/plugin/xt9jinputmethod_p.h index e3db27fc..0c4e37c1 100644 --- a/src/plugins/cerence/xt9/plugin/xt9jinputmethod_p.h +++ b/src/plugins/cerence/xt9/plugin/xt9jinputmethod_p.h @@ -17,6 +17,8 @@ class Xt9JInputMethod : public Xt9AwInputMethod Q_DECLARE_PRIVATE(Xt9JInputMethod) Q_PROPERTY(bool modifyKeyEnabled READ isModifyKeyEnabled NOTIFY modifyKeyEnabledChanged) QML_NAMED_ELEMENT(JapaneseInputMethod) + QML_ADDED_IN_VERSION(2, 0) + public: explicit Xt9JInputMethod(QObject *parent = nullptr); diff --git a/src/plugins/cerence/xt9/plugin/xt9kinputmethod_p.h b/src/plugins/cerence/xt9/plugin/xt9kinputmethod_p.h index 73761a25..e952163d 100644 --- a/src/plugins/cerence/xt9/plugin/xt9kinputmethod_p.h +++ b/src/plugins/cerence/xt9/plugin/xt9kinputmethod_p.h @@ -16,6 +16,8 @@ class Xt9KInputMethod : public Xt9AwInputMethod Q_OBJECT Q_DECLARE_PRIVATE(Xt9KInputMethod) QML_NAMED_ELEMENT(HangulInputMethod) + QML_ADDED_IN_VERSION(2, 0) + public: explicit Xt9KInputMethod(QObject *parent = nullptr); diff --git a/src/plugins/cerence/xt9/plugin/xt9thaiinputmethod_p.h b/src/plugins/cerence/xt9/plugin/xt9thaiinputmethod_p.h index 5ba7b882..b7665cb1 100644 --- a/src/plugins/cerence/xt9/plugin/xt9thaiinputmethod_p.h +++ b/src/plugins/cerence/xt9/plugin/xt9thaiinputmethod_p.h @@ -16,6 +16,8 @@ class Xt9ThaiInputMethod : public Xt9AwInputMethod Q_OBJECT Q_DECLARE_PRIVATE(Xt9ThaiInputMethod) QML_NAMED_ELEMENT(ThaiInputMethod) + QML_ADDED_IN_VERSION(2, 0) + public: explicit Xt9ThaiInputMethod(QObject *parent = nullptr); diff --git a/src/plugins/example/CMakeLists.txt b/src/plugins/example/CMakeLists.txt index acb5bc7a..c196d7de 100644 --- a/src/plugins/example/CMakeLists.txt +++ b/src/plugins/example/CMakeLists.txt @@ -7,6 +7,7 @@ list(APPEND example_imports QtQuick.VirtualKeyboard.Plugins.Example.HWR/auto) qt_internal_add_qml_module(qtvkbexampleplugin URI "QtQuick.VirtualKeyboard.Plugins.Example" VERSION "${PROJECT_VERSION}" + PAST_MAJOR_VERSIONS 2 PLUGIN_TARGET qtvkbexampleplugin IMPORTS ${example_imports} diff --git a/src/plugins/example/hwr/CMakeLists.txt b/src/plugins/example/hwr/CMakeLists.txt index c9717dbd..11794dce 100644 --- a/src/plugins/example/hwr/CMakeLists.txt +++ b/src/plugins/example/hwr/CMakeLists.txt @@ -4,6 +4,7 @@ qt_internal_add_qml_module(qtvkbexamplehwrplugin URI "QtQuick.VirtualKeyboard.Plugins.Example.HWR" VERSION "${PROJECT_VERSION}" + PAST_MAJOR_VERSIONS 2 PLUGIN_TARGET qtvkbexamplehwrplugin NO_PLUGIN_OPTIONAL DEPENDENCIES diff --git a/src/plugins/example/hwr/examplehwrinputmethod_p.h b/src/plugins/example/hwr/examplehwrinputmethod_p.h index d0307701..3bb47c3f 100644 --- a/src/plugins/example/hwr/examplehwrinputmethod_p.h +++ b/src/plugins/example/hwr/examplehwrinputmethod_p.h @@ -27,6 +27,7 @@ class ExampleHwrInputMethod : public QVirtualKeyboardAbstractInputMethod Q_OBJECT Q_DECLARE_PRIVATE(ExampleHwrInputMethod) QML_NAMED_ELEMENT(HandwritingInputMethod) + QML_ADDED_IN_VERSION(2, 0) public: explicit ExampleHwrInputMethod(QObject *parent = nullptr); diff --git a/src/plugins/hangul/CMakeLists.txt b/src/plugins/hangul/CMakeLists.txt index e6a30f1a..9fc6b7b1 100644 --- a/src/plugins/hangul/CMakeLists.txt +++ b/src/plugins/hangul/CMakeLists.txt @@ -8,6 +8,7 @@ qt_internal_add_qml_module(qtvkbhangulplugin URI "QtQuick.VirtualKeyboard.Plugins.Hangul" VERSION "${PROJECT_VERSION}" + PAST_MAJOR_VERSIONS 2 PLUGIN_TARGET qtvkbhangulplugin NO_PLUGIN_OPTIONAL DEPENDENCIES diff --git a/src/plugins/hangul/hangulinputmethod_p.h b/src/plugins/hangul/hangulinputmethod_p.h index 55e0dfdd..7421232c 100644 --- a/src/plugins/hangul/hangulinputmethod_p.h +++ b/src/plugins/hangul/hangulinputmethod_p.h @@ -27,6 +27,8 @@ class HangulInputMethod : public QVirtualKeyboardAbstractInputMethod Q_OBJECT Q_DECLARE_PRIVATE(HangulInputMethod) QML_ELEMENT + QML_ADDED_IN_VERSION(2, 0) + public: explicit HangulInputMethod(QObject *parent = nullptr); ~HangulInputMethod(); diff --git a/src/plugins/hunspell/module/CMakeLists.txt b/src/plugins/hunspell/module/CMakeLists.txt index 2f534764..5c6d231f 100644 --- a/src/plugins/hunspell/module/CMakeLists.txt +++ b/src/plugins/hunspell/module/CMakeLists.txt @@ -8,6 +8,7 @@ qt_internal_add_qml_module(HunspellInputMethod URI "QtQuick.VirtualKeyboard.Plugins.Hunspell" VERSION "${PROJECT_VERSION}" + PAST_MAJOR_VERSIONS 2 PLUGIN_TARGET qtvkbhunspellplugin NO_PLUGIN_OPTIONAL DEPENDENCIES diff --git a/src/plugins/hunspell/module/hunspellinputmethod_p.h b/src/plugins/hunspell/module/hunspellinputmethod_p.h index b898dc2c..fb90812a 100644 --- a/src/plugins/hunspell/module/hunspellinputmethod_p.h +++ b/src/plugins/hunspell/module/hunspellinputmethod_p.h @@ -29,6 +29,8 @@ class Q_HUNSPELLINPUTMETHOD_EXPORT HunspellInputMethod : public QVirtualKeyboard Q_OBJECT Q_DECLARE_PRIVATE(HunspellInputMethod) QML_NAMED_ELEMENT(DefaultInputMethod) + QML_ADDED_IN_VERSION(2, 0) + protected: HunspellInputMethod(HunspellInputMethodPrivate &dd, QObject *parent); public: diff --git a/src/plugins/myscript/plugin/CMakeLists.txt b/src/plugins/myscript/plugin/CMakeLists.txt index fa8f43f5..688aa2c8 100644 --- a/src/plugins/myscript/plugin/CMakeLists.txt +++ b/src/plugins/myscript/plugin/CMakeLists.txt @@ -23,6 +23,7 @@ set(MYSCRIPT_LANGUAGE_RESOURCES_NAME "resources") qt_internal_add_qml_module(qtvkbmyscriptplugin URI "QtQuick.VirtualKeyboard.Plugins.MyScript" VERSION "${PROJECT_VERSION}" + PAST_MAJOR_VERSIONS 2 PLUGIN_TARGET qtvkbmyscriptplugin NO_PLUGIN_OPTIONAL DEPENDENCIES diff --git a/src/plugins/myscript/plugin/myscriptinputmethod_p.h b/src/plugins/myscript/plugin/myscriptinputmethod_p.h index bc0faec8..83b66565 100644 --- a/src/plugins/myscript/plugin/myscriptinputmethod_p.h +++ b/src/plugins/myscript/plugin/myscriptinputmethod_p.h @@ -30,6 +30,8 @@ class MyScriptInputMethod : public QVirtualKeyboardAbstractInputMethod Q_DECLARE_PRIVATE(MyScriptInputMethod) Q_PROPERTY(bool superimposed READ superimposed CONSTANT) QML_NAMED_ELEMENT(HandwritingInputMethod) + QML_ADDED_IN_VERSION(2, 0) + public: explicit MyScriptInputMethod(QObject *parent = nullptr); ~MyScriptInputMethod(); diff --git a/src/plugins/openwnn/CMakeLists.txt b/src/plugins/openwnn/CMakeLists.txt index 48dc81bd..30107dff 100644 --- a/src/plugins/openwnn/CMakeLists.txt +++ b/src/plugins/openwnn/CMakeLists.txt @@ -10,6 +10,7 @@ add_subdirectory(3rdparty/openwnn) qt_internal_add_qml_module(qtvkbopenwnnplugin URI "QtQuick.VirtualKeyboard.Plugins.OpenWNN" VERSION "${PROJECT_VERSION}" + PAST_MAJOR_VERSIONS 2 PLUGIN_TARGET qtvkbopenwnnplugin NO_PLUGIN_OPTIONAL DEPENDENCIES diff --git a/src/plugins/openwnn/openwnninputmethod_p.h b/src/plugins/openwnn/openwnninputmethod_p.h index 20ffa2c1..439cd0d3 100644 --- a/src/plugins/openwnn/openwnninputmethod_p.h +++ b/src/plugins/openwnn/openwnninputmethod_p.h @@ -27,6 +27,7 @@ class OpenWnnInputMethod : public QVirtualKeyboardAbstractInputMethod Q_OBJECT Q_DECLARE_PRIVATE(OpenWnnInputMethod) QML_NAMED_ELEMENT(JapaneseInputMethod) + QML_ADDED_IN_VERSION(2, 0) public: explicit OpenWnnInputMethod(QObject *parent = nullptr); diff --git a/src/plugins/pinyin/CMakeLists.txt b/src/plugins/pinyin/CMakeLists.txt index b4828847..6e75b304 100644 --- a/src/plugins/pinyin/CMakeLists.txt +++ b/src/plugins/pinyin/CMakeLists.txt @@ -10,6 +10,7 @@ add_subdirectory(3rdparty/pinyin) qt_internal_add_qml_module(qtvkbpinyinplugin URI "QtQuick.VirtualKeyboard.Plugins.Pinyin" VERSION "${PROJECT_VERSION}" + PAST_MAJOR_VERSIONS 2 PLUGIN_TARGET qtvkbpinyinplugin NO_PLUGIN_OPTIONAL DEPENDENCIES diff --git a/src/plugins/pinyin/pinyininputmethod_p.h b/src/plugins/pinyin/pinyininputmethod_p.h index eaac2f5c..d246d75a 100644 --- a/src/plugins/pinyin/pinyininputmethod_p.h +++ b/src/plugins/pinyin/pinyininputmethod_p.h @@ -27,6 +27,7 @@ class PinyinInputMethod : public QVirtualKeyboardAbstractInputMethod Q_OBJECT Q_DECLARE_PRIVATE(PinyinInputMethod) QML_ELEMENT + QML_ADDED_IN_VERSION(2, 0) public: explicit PinyinInputMethod(QObject *parent = nullptr); diff --git a/src/plugins/tcime/CMakeLists.txt b/src/plugins/tcime/CMakeLists.txt index ee3d1f10..a5d5786e 100644 --- a/src/plugins/tcime/CMakeLists.txt +++ b/src/plugins/tcime/CMakeLists.txt @@ -10,6 +10,7 @@ add_subdirectory(3rdparty/tcime) qt_internal_add_qml_module(qtvkbtcimeplugin URI "QtQuick.VirtualKeyboard.Plugins.TCIme" VERSION "${PROJECT_VERSION}" + PAST_MAJOR_VERSIONS 2 PLUGIN_TARGET qtvkbtcimeplugin NO_PLUGIN_OPTIONAL DEPENDENCIES diff --git a/src/plugins/tcime/tcinputmethod_p.h b/src/plugins/tcime/tcinputmethod_p.h index 0dcb63df..eee0278e 100644 --- a/src/plugins/tcime/tcinputmethod_p.h +++ b/src/plugins/tcime/tcinputmethod_p.h @@ -29,6 +29,7 @@ class TCInputMethod : public QVirtualKeyboardAbstractInputMethod Q_DECLARE_PRIVATE(TCInputMethod) Q_PROPERTY(bool simplified READ simplified WRITE setSimplified NOTIFY simplifiedChanged) QML_ELEMENT + QML_ADDED_IN_VERSION(2, 0) public: explicit TCInputMethod(QObject *parent = nullptr); diff --git a/src/plugins/thai/CMakeLists.txt b/src/plugins/thai/CMakeLists.txt index 357fb1a0..9f906e8a 100644 --- a/src/plugins/thai/CMakeLists.txt +++ b/src/plugins/thai/CMakeLists.txt @@ -8,6 +8,7 @@ qt_internal_add_qml_module(qtvkbthaiplugin URI "QtQuick.VirtualKeyboard.Plugins.Thai" VERSION "${PROJECT_VERSION}" + PAST_MAJOR_VERSIONS 2 PLUGIN_TARGET qtvkbthaiplugin NO_PLUGIN_OPTIONAL DEPENDENCIES diff --git a/src/plugins/thai/thaiinputmethod_p.h b/src/plugins/thai/thaiinputmethod_p.h index d6f2f528..af1f4217 100644 --- a/src/plugins/thai/thaiinputmethod_p.h +++ b/src/plugins/thai/thaiinputmethod_p.h @@ -22,6 +22,8 @@ class ThaiInputMethod : public ThaiInputMethodBase Q_OBJECT Q_DECLARE_PRIVATE(ThaiInputMethod) QML_ELEMENT + QML_ADDED_IN_VERSION(2, 0) + public: explicit ThaiInputMethod(QObject *parent = nullptr); diff --git a/src/styles/builtin/CMakeLists.txt b/src/styles/builtin/CMakeLists.txt index 3ae819ed..83619a9f 100644 --- a/src/styles/builtin/CMakeLists.txt +++ b/src/styles/builtin/CMakeLists.txt @@ -4,6 +4,7 @@ qt_internal_add_qml_module(qtvkbbuiltinstylesplugin URI "QtQuick.VirtualKeyboard.Styles.Builtin" VERSION "${PROJECT_VERSION}" + PAST_MAJOR_VERSIONS 2 1 PLUGIN_TARGET qtvkbbuiltinstylesplugin CLASS_NAME "QtQuickVirtualKeyboardStylesBuiltinPlugin" NO_PLUGIN_OPTIONAL diff --git a/src/virtualkeyboard/plaininputmethod_p.h b/src/virtualkeyboard/plaininputmethod_p.h index d3e94cb8..4e8c2217 100644 --- a/src/virtualkeyboard/plaininputmethod_p.h +++ b/src/virtualkeyboard/plaininputmethod_p.h @@ -25,6 +25,7 @@ class Q_VIRTUALKEYBOARD_EXPORT PlainInputMethod : public QVirtualKeyboardAbstrac { Q_OBJECT QML_NAMED_ELEMENT(PlainInputMethod) + QML_ADDED_IN_VERSION(2, 0) public: explicit PlainInputMethod(QObject *parent = nullptr); diff --git a/src/virtualkeyboard/qvirtualkeyboardfeatures_namespace_p.h b/src/virtualkeyboard/qvirtualkeyboardfeatures_namespace_p.h index 0fdba36e..16079eae 100644 --- a/src/virtualkeyboard/qvirtualkeyboardfeatures_namespace_p.h +++ b/src/virtualkeyboard/qvirtualkeyboardfeatures_namespace_p.h @@ -26,6 +26,7 @@ namespace QVirtualKeyboardFeatures { Q_VIRTUALKEYBOARD_PRIVATE_EXPORT Q_NAMESPACE QML_NAMED_ELEMENT(VirtualKeyboardFeatures) +QML_ADDED_IN_VERSION(6, 4) enum Feature { Handwriting = diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext.h b/src/virtualkeyboard/qvirtualkeyboardinputcontext.h index 15e5877b..1bd81d58 100644 --- a/src/virtualkeyboard/qvirtualkeyboardinputcontext.h +++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext.h @@ -27,9 +27,9 @@ class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardInputContext : public QObject Q_DISABLE_COPY(QVirtualKeyboardInputContext) Q_DECLARE_PRIVATE(QVirtualKeyboardInputContext) Q_PROPERTY(bool shift READ isShiftActive NOTIFY shiftActiveChanged) - Q_PROPERTY(bool shiftActive READ isShiftActive NOTIFY shiftActiveChanged REVISION 4) + Q_PROPERTY(bool shiftActive READ isShiftActive NOTIFY shiftActiveChanged REVISION(2, 4)) Q_PROPERTY(bool capsLock READ isCapsLockActive NOTIFY capsLockActiveChanged) - Q_PROPERTY(bool capsLockActive READ isCapsLockActive NOTIFY capsLockActiveChanged REVISION 4) + Q_PROPERTY(bool capsLockActive READ isCapsLockActive NOTIFY capsLockActiveChanged REVISION(2, 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) @@ -46,7 +46,7 @@ class Q_VIRTUALKEYBOARD_EXPORT QVirtualKeyboardInputContext : public QObject 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) + Q_PROPERTY(QVirtualKeyboardInputContextPrivate *priv READ priv CONSTANT REVISION(2, 0)) Q_PROPERTY(QVirtualKeyboardObserver *keyboardObserver READ keyboardObserver CONSTANT REVISION(6, 1)) Q_MOC_INCLUDE("qvirtualkeyboardinputengine.h") Q_MOC_INCLUDE("qvirtualkeyboardinputcontext_p.h") diff --git a/src/virtualkeyboard/qvirtualkeyboardnamespace_p.h b/src/virtualkeyboard/qvirtualkeyboardnamespace_p.h index 98a4b89d..60587a50 100644 --- a/src/virtualkeyboard/qvirtualkeyboardnamespace_p.h +++ b/src/virtualkeyboard/qvirtualkeyboardnamespace_p.h @@ -25,6 +25,7 @@ namespace QtVirtualKeyboard { Q_VIRTUALKEYBOARD_EXPORT Q_NAMESPACE QML_NAMED_ELEMENT(QtVirtualKeyboard) +QML_ADDED_IN_VERSION(6, 4) enum class KeyType { BaseKey, diff --git a/src/virtualkeyboard/shadowinputcontext_p.h b/src/virtualkeyboard/shadowinputcontext_p.h index 6b014c64..aa07ddb6 100644 --- a/src/virtualkeyboard/shadowinputcontext_p.h +++ b/src/virtualkeyboard/shadowinputcontext_p.h @@ -45,6 +45,7 @@ class Q_VIRTUALKEYBOARD_EXPORT ShadowInputContext : public QObject Q_PROPERTY(bool selectionControlVisible READ selectionControlVisible NOTIFY selectionControlVisibleChanged) QML_NAMED_ELEMENT(ShadowInputContext) QML_UNCREATABLE("ShadowInputContext is only available via InputContext.priv.shadow") + QML_ADDED_IN_VERSION(2, 0) explicit ShadowInputContext(QObject *parent = nullptr); diff --git a/tests/auto/inputpanel/data/tst_inputpanel.qml b/tests/auto/inputpanel/data/tst_inputpanel.qml index dadd090d..2dee2ee7 100644 --- a/tests/auto/inputpanel/data/tst_inputpanel.qml +++ b/tests/auto/inputpanel/data/tst_inputpanel.qml @@ -126,65 +126,65 @@ Rectangle { function test_versionCheck_data() { return [ // Note: Add new import versions here - { qml: "import QtQuick; \ - import QtQuick.VirtualKeyboard; \ + { qml: "import QtQuick 2.0; \ + import QtQuick.VirtualKeyboard 1.0; \ Item {}" }, - { qml: "import QtQuick; \ - import QtQuick.VirtualKeyboard; \ + { qml: "import QtQuick 2.0; \ + import QtQuick.VirtualKeyboard 1.1; \ Item {}" }, - { qml: "import QtQuick; \ - import QtQuick.VirtualKeyboard; \ + { qml: "import QtQuick 2.0; \ + import QtQuick.VirtualKeyboard 1.2; \ Item {}" }, - { qml: "import QtQuick; \ - import QtQuick.VirtualKeyboard; \ + { qml: "import QtQuick 2.0; \ + import QtQuick.VirtualKeyboard 1.3; \ Item {}" }, - { qml: "import QtQuick; \ - import QtQuick.VirtualKeyboard; \ + { qml: "import QtQuick 2.0; \ + import QtQuick.VirtualKeyboard 2.0; \ Item {}" }, - { qml: "import QtQuick; \ - import QtQuick.VirtualKeyboard; \ + { qml: "import QtQuick 2.0; \ + import QtQuick.VirtualKeyboard 2.1; \ Item {}" }, - { qml: "import QtQuick; \ - import QtQuick.VirtualKeyboard.Styles; \ + { qml: "import QtQuick 2.0; \ + import QtQuick.VirtualKeyboard.Styles 1.0; \ KeyboardStyle {}" }, - { qml: "import QtQuick; \ - import QtQuick.VirtualKeyboard.Styles; \ + { qml: "import QtQuick 2.0; \ + import QtQuick.VirtualKeyboard.Styles 1.1; \ KeyboardStyle {}" }, - { qml: "import QtQuick; \ - import QtQuick.VirtualKeyboard.Styles; \ + { qml: "import QtQuick 2.0; \ + import QtQuick.VirtualKeyboard.Styles 1.2; \ KeyboardStyle {}" }, - { qml: "import QtQuick; \ - import QtQuick.VirtualKeyboard.Styles; \ + { qml: "import QtQuick 2.0; \ + import QtQuick.VirtualKeyboard.Styles 1.3; \ KeyboardStyle {}" }, - { qml: "import QtQuick; \ - import QtQuick.VirtualKeyboard.Styles; \ + { qml: "import QtQuick 2.0; \ + import QtQuick.VirtualKeyboard.Styles 2.0; \ KeyboardStyle {}" }, - { qml: "import QtQuick; \ - import QtQuick.VirtualKeyboard.Styles; \ + { qml: "import QtQuick 2.0; \ + import QtQuick.VirtualKeyboard.Styles 2.1; \ KeyboardStyle {}" }, - { qml: "import QtQuick; \ - import QtQuick.VirtualKeyboard.Settings; \ + { qml: "import QtQuick 2.0; \ + import QtQuick.VirtualKeyboard.Settings 1.0; \ Item { property var styleName: VirtualKeyboardSettings.styleName }" }, - { qml: "import QtQuick; \ - import QtQuick.VirtualKeyboard.Settings; \ + { qml: "import QtQuick 2.0; \ + import QtQuick.VirtualKeyboard.Settings 1.1; \ Item { property var styleName: VirtualKeyboardSettings.styleName }" }, - { qml: "import QtQuick; \ - import QtQuick.VirtualKeyboard.Settings; \ + { qml: "import QtQuick 2.0; \ + import QtQuick.VirtualKeyboard.Settings 1.2; \ Item { property var styleName: VirtualKeyboardSettings.styleName }" }, - { qml: "import QtQuick; \ - import QtQuick.VirtualKeyboard.Settings; \ + { qml: "import QtQuick 2.0; \ + import QtQuick.VirtualKeyboard.Settings 2.0; \ Item { property var styleName: VirtualKeyboardSettings.styleName; \ property var locale: VirtualKeyboardSettings.locale; \ property var availableLocales: VirtualKeyboardSettings.availableLocales; \ property var activeLocales: VirtualKeyboardSettings.activeLocales }" }, - { qml: "import QtQuick; \ - import QtQuick.VirtualKeyboard.Settings; \ + { qml: "import QtQuick 2.0; \ + import QtQuick.VirtualKeyboard.Settings 2.1; \ Item { property var styleName: VirtualKeyboardSettings.styleName; \ property var locale: VirtualKeyboardSettings.locale; \ property var availableLocales: VirtualKeyboardSettings.availableLocales; \ property var activeLocales: VirtualKeyboardSettings.activeLocales }" }, - { qml: "import QtQuick; \ - import QtQuick.VirtualKeyboard.Settings; \ + { qml: "import QtQuick 2.7; \ + import QtQuick.VirtualKeyboard.Settings 2.2; \ Item { property var styleName: VirtualKeyboardSettings.styleName; \ property var locale: VirtualKeyboardSettings.locale; \ property var availableLocales: VirtualKeyboardSettings.availableLocales; \ @@ -193,6 +193,20 @@ Rectangle { property var wclAlwaysVisible: VirtualKeyboardSettings.wordCandidateList.alwaysVisible; \ property var wclAutoCommitWord: VirtualKeyboardSettings.wordCandidateList.autoCommitWord; \ property var fullScreenMode: VirtualKeyboardSettings.fullScreenMode; }" }, + // without versions + { qml: "import QtQuick; \ + import QtQuick.VirtualKeyboard; \ + import QtQuick.VirtualKeyboard.Styles; \ + import QtQuick.VirtualKeyboard.Settings; \ + import QtQuick.VirtualKeyboard.Plugins; \ + Item {}" }, + // virtual keyboard 5.15 + { qml: "import QtQuick 2.7; \ + import QtQuick.VirtualKeyboard 2.3; \ + import QtQuick.VirtualKeyboard.Styles 2.1; \ + import QtQuick.VirtualKeyboard.Settings 2.2; \ + import QtQuick.VirtualKeyboard.Plugins 2.3; \ + Item {}" }, ] } -- cgit v1.2.3