diff options
author | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2018-08-24 10:54:56 +0300 |
---|---|---|
committer | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2018-09-06 09:46:11 +0000 |
commit | 35102b362db11828e01e7356c42c4a9e8764ac60 (patch) | |
tree | 921508408bfe566f52427cf2294bc75af7cac174 /src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp | |
parent | ee16df4f0f4ec884abf5b676706ecd1c8851b8a0 (diff) |
Move QML types registration to import modules
This change moves the QML type registration from platform input
context plugin to respective QML plugins:
QtQuick.VirtualKeyboard (import.pro)
QtQuick.VirtualKeyboard.Settings (settings.pro)
Input method types (e.g. from the virtual keyboard plugins) are still
registered in the qtvirtualkeyboard module, but with new URI:
QtQuick.VirtualKeyboard.Plugins (plugin.pro)
This change is necessary, because the Quick.VirtualKeyboard URI is now
reserved for the QML module.
Like before, the Quick.VirtualKeyboard module cannot be used without
setting QT_IM_MODULE=qtvirtualkeyboard environment variable.
The main motivation for this change was to make plugins.qmltypes
generation possible for C++ based QML types.
Change-Id: Ieb449eb73e0fa33e9a1686d471cc4284982ea1bd
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp')
-rw-r--r-- | src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp index 6b1b7819..9e684c3b 100644 --- a/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp +++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp @@ -67,8 +67,9 @@ using namespace QtVirtualKeyboard; Constructs an input context with \a parent as the platform input context. */ -QVirtualKeyboardInputContext::QVirtualKeyboardInputContext(QtVirtualKeyboard::PlatformInputContext *parent) : - d_ptr(new QVirtualKeyboardInputContextPrivate(this, parent)) +QVirtualKeyboardInputContext::QVirtualKeyboardInputContext(QObject *parent) : + QObject(parent), + d_ptr(new QVirtualKeyboardInputContextPrivate(this)) { Q_D(QVirtualKeyboardInputContext); d->init(); |