diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:01:45 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:01:45 +0200 |
commit | 55a84658fcf9eba7de8225b61df134cfa186e126 (patch) | |
tree | 25b40670ad5e8f376ea83d251735ddd8b719f026 /src/import/qtquickvirtualkeyboardplugin.cpp | |
parent | fb9e76c9ebcc9ca98ff04e7310a12b4511fa5539 (diff) | |
parent | ce78e82bc64fadf85b4c65a7979873a8b1d2b9c7 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ifa8bf609063e735b37b865313ee9abef81f9968b
Diffstat (limited to 'src/import/qtquickvirtualkeyboardplugin.cpp')
-rw-r--r-- | src/import/qtquickvirtualkeyboardplugin.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/import/qtquickvirtualkeyboardplugin.cpp b/src/import/qtquickvirtualkeyboardplugin.cpp index 9fa769e8..11a5f5cb 100644 --- a/src/import/qtquickvirtualkeyboardplugin.cpp +++ b/src/import/qtquickvirtualkeyboardplugin.cpp @@ -77,7 +77,8 @@ void QtQuickVirtualKeyboardPlugin::registerTypes(const char *uri) qmlRegisterUncreatableType<QVirtualKeyboardAbstractInputMethod>(uri, 2, 0, "AbstractInputMethod", QLatin1String("Cannot create abstract input method")); qmlRegisterType<InputMethod>(uri, 1, 0, "InputMethod"); qmlRegisterType<InputMethod>(uri, 2, 0, "InputMethod"); - qmlRegisterType<EnterKeyActionAttachedType>(); + qmlRegisterAnonymousType<EnterKeyActionAttachedType>(uri, 1); + qmlRegisterAnonymousType<EnterKeyActionAttachedType>(uri, 2); qmlRegisterType<EnterKeyAction>(uri, 1, 0, "EnterKeyAction"); qmlRegisterType<EnterKeyAction>(uri, 2, 0, "EnterKeyAction"); qmlRegisterType<QVirtualKeyboardTrace>(uri, 2, 0, "Trace"); |