diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 17:23:10 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 17:23:10 +0200 |
| commit | 2678c4316eb22242ddd564c68acd4513836c9659 (patch) | |
| tree | b76e403ad6dd2de74d8536716a11eb7dd5879f93 /src/import | |
| parent | e121dc2398682de49c3fd86479c091e8ade1d552 (diff) | |
| parent | b550d02035516dfcb5a3739aa16efbca0e143922 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
src/import/qtquickvirtualkeyboardplugin.cpp
Change-Id: I1f094ac933f1c5b1fd4b59f57ea76d6c1cec3ede
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 ed0ea4a6..7e45938f 100644 --- a/src/import/qtquickvirtualkeyboardplugin.cpp +++ b/src/import/qtquickvirtualkeyboardplugin.cpp @@ -146,8 +146,9 @@ void QtQuickVirtualKeyboardPlugin::registerTypes(const char *uri) qmlRegisterType(QUrl(componentsPath + QLatin1String("SelectionControl.qml")), uri, 2, 1, "SelectionControl"); qmlRegisterType(QUrl(componentsPath + QLatin1String("InputModeKey.qml")), uri, 2, 3, "InputModeKey"); - // 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 |