diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-06 16:20:05 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-06 17:08:01 +0200 |
| commit | b550d02035516dfcb5a3739aa16efbca0e143922 (patch) | |
| tree | 11b254dbbe0a3e78a9d15d3db4efc89c2f9435ad /src/import | |
| parent | fac2615b2775e09a36901575898e0628606d2d06 (diff) | |
Fix Qt6 build
Modify all the qmlRegisterModule calls to use minor version 15
because minor version zero from 6.0.0 would make tests fail.
This is similar to what was done in qtdeclarative in
c147b20a2c1299b2d659fe7c9472ae3866b6a425.
Change-Id: Id8102e41cd6b05927338ec062ec7869b24dd9eff
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/import')
| -rw-r--r-- | src/import/qtquickvirtualkeyboardplugin.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/import/qtquickvirtualkeyboardplugin.cpp b/src/import/qtquickvirtualkeyboardplugin.cpp index 9fa769e8..1c7b6b11 100644 --- a/src/import/qtquickvirtualkeyboardplugin.cpp +++ b/src/import/qtquickvirtualkeyboardplugin.cpp @@ -148,8 +148,9 @@ void QtQuickVirtualKeyboardPlugin::registerTypes(const char *uri) // New revisions in 5.12. qmlRegisterSingletonType<QVirtualKeyboardInputContext>(uri, 2, 4, "InputContext", createInputContextModule); - // Auto-increment the import to stay in sync with ALL future QtQuick minor versions - qmlRegisterModule(uri, 2, QT_VERSION_MINOR); + // The minor version used to be the current Qt 5 minor. For compatibility it is the last + // Qt 5 release. + qmlRegisterModule(uri, 2, 15); } QT_END_NAMESPACE |