diff options
Diffstat (limited to 'src')
4 files changed, 11 insertions, 6 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 diff --git a/src/plugins/openwnn/3rdparty/openwnn/wnnEngine/include/wnnword.h b/src/plugins/openwnn/3rdparty/openwnn/wnnEngine/include/wnnword.h index c7674ca4..bcb6f1bb 100644 --- a/src/plugins/openwnn/3rdparty/openwnn/wnnEngine/include/wnnword.h +++ b/src/plugins/openwnn/3rdparty/openwnn/wnnEngine/include/wnnword.h @@ -135,6 +135,8 @@ public: class WnnClause : public WnnWord { public: + WnnClause() = default; + WnnClause(const QString &candidate, const QString &stroke, const WnnPOS &posTag, int frequency) : WnnWord(candidate, stroke, posTag, frequency) { } diff --git a/src/settings/qtquickvirtualkeyboardsettingsplugin.cpp b/src/settings/qtquickvirtualkeyboardsettingsplugin.cpp index db572243..06758db8 100644 --- a/src/settings/qtquickvirtualkeyboardsettingsplugin.cpp +++ b/src/settings/qtquickvirtualkeyboardsettingsplugin.cpp @@ -49,8 +49,9 @@ void QtQuickVirtualKeyboardSettingsPlugin::registerTypes(const char *uri) qRegisterMetaType<WordCandidateListSettings *>("WordCandidateListSettings*"); qmlRegisterUncreatableType<WordCandidateListSettings>(uri, 2, 2, "WordCandidateListSettings", QLatin1String("Cannot create word candidate list settings")); - // 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 diff --git a/src/styles/qtquickvirtualkeyboardstylesplugin.cpp b/src/styles/qtquickvirtualkeyboardstylesplugin.cpp index c52525aa..8761af38 100644 --- a/src/styles/qtquickvirtualkeyboardstylesplugin.cpp +++ b/src/styles/qtquickvirtualkeyboardstylesplugin.cpp @@ -74,8 +74,9 @@ void QtQuickVirtualKeyboardStylesPlugin::registerTypes(const char *uri) qmlRegisterType(QUrl(path + QLatin1String("TraceInputKeyPanel.qml")), uri, 2, 0, "TraceInputKeyPanel"); qmlRegisterType(QUrl(path + QLatin1String("TraceCanvas.qml")), uri, 2, 0, "TraceCanvas"); - // 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); } void QtQuickVirtualKeyboardStylesPlugin::initializeEngine(QQmlEngine *engine, const char *uri) |