aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmlmodels/qqmlmodelsmodule.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-07-12 22:07:37 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2019-07-17 12:36:35 +0000
commitaf1c5e013733b660bc5d813d92e55f2e6d009e4a (patch)
tree92bf05a0709f546f209430dcb658102280160c22 /src/qmlmodels/qqmlmodelsmodule.cpp
parentc147b20a2c1299b2d659fe7c9472ae3866b6a425 (diff)
Fix import of ListModel/ListElement as part of QtQml
ListElement and ListModel were available in Qt 5 since minor version 0 in QtQml and since minor version 1 in QtQml.Models. So one had to either write "import QtQml 2.0" or "import QtQml.Models 2.1". Since the explicit registration in QtQml is gone and to be replaced with an implicit dependency that loads QtQml.Models when loading QtQml, with the same minor version, we need to lower the minor version to 0 for both. This is unlikley to cause any harm as previously import QtQml.Models 2.0 would not produce any types. Change-Id: Iff7c4a1c1b35e4c9d930aa45dd678d8e2d5c823c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qmlmodels/qqmlmodelsmodule.cpp')
-rw-r--r--src/qmlmodels/qqmlmodelsmodule.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qmlmodels/qqmlmodelsmodule.cpp b/src/qmlmodels/qqmlmodelsmodule.cpp
index 2db5dd834f..364c2407ab 100644
--- a/src/qmlmodels/qqmlmodelsmodule.cpp
+++ b/src/qmlmodels/qqmlmodelsmodule.cpp
@@ -102,8 +102,8 @@ void QQmlModelsModule::defineModule()
const char uri[] = "QtQml.Models";
#if QT_CONFIG(qml_list_model)
- qmlRegisterType<QQmlListElement>(uri, 2, 1, "ListElement");
- qmlRegisterCustomType<QQmlListModel>(uri, 2, 1, "ListModel", new QQmlListModelParser);
+ qmlRegisterType<QQmlListElement>(uri, 2, 0, "ListElement");
+ qmlRegisterCustomType<QQmlListModel>(uri, 2, 0, "ListModel", new QQmlListModelParser);
#endif
#if QT_CONFIG(qml_delegate_model)
qmlRegisterType<QQmlDelegateModel>(uri, 2, 1, "DelegateModel");