diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-15 18:40:58 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-15 18:44:54 +0200 |
| commit | 2be575b4b1e6f6e11a8dbd0b1c05c003828d2598 (patch) | |
| tree | 55d2bfaff9583b3e1e9f3291f4b91f34adae1d92 /src/qmlmodels | |
| parent | 4a5939d26d1e36efdb2b30cdee1f3672587c3fa5 (diff) | |
| parent | 9e32b23a1514f367921b4a9ee25bc864a008463c (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I6f2152aeecaeb8e63fdbc1cdf1444132a054b6f5
Diffstat (limited to 'src/qmlmodels')
| -rw-r--r-- | src/qmlmodels/configure.cmake | 2 | ||||
| -rw-r--r-- | src/qmlmodels/configure.json | 2 | ||||
| -rw-r--r-- | src/qmlmodels/qqmlmodelsmodule.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/qmlmodels/configure.cmake b/src/qmlmodels/configure.cmake index b8409f7106..43c3ac8aab 100644 --- a/src/qmlmodels/configure.cmake +++ b/src/qmlmodels/configure.cmake @@ -16,7 +16,7 @@ qt_feature("qml_object_model" PRIVATE SECTION "QML" - LABEL "QML list model" + LABEL "QML object model" PURPOSE "Provides the ObjectModel and Instantiator QML types." ) qt_feature("qml_list_model" PRIVATE diff --git a/src/qmlmodels/configure.json b/src/qmlmodels/configure.json index 2b4fa4f6e2..84eefed261 100644 --- a/src/qmlmodels/configure.json +++ b/src/qmlmodels/configure.json @@ -7,7 +7,7 @@ "features": { "qml-object-model" : { - "label": "QML list model", + "label": "QML object model", "purpose": "Provides the ObjectModel and Instantiator QML types.", "section": "QML", "output": [ "privateFeature" ] diff --git a/src/qmlmodels/qqmlmodelsmodule.cpp b/src/qmlmodels/qqmlmodelsmodule.cpp index 5195f9baad..884b7f78b2 100644 --- a/src/qmlmodels/qqmlmodelsmodule.cpp +++ b/src/qmlmodels/qqmlmodelsmodule.cpp @@ -71,6 +71,8 @@ void QQmlModelsModule::defineModule() qmlRegisterCustomType<QQmlListModel>(uri, 2, 0, "ListModel", new QQmlListModelParser); #endif #if QT_CONFIG(qml_delegate_model) + qmlRegisterType<QQmlDelegateModel>(uri, 2, 0, "VisualDataModel"); + qmlRegisterType<QQmlDelegateModelGroup>(uri, 2, 0, "VisualDataGroup"); qmlRegisterType<QQmlDelegateModel>(uri, 2, 1, "DelegateModel"); qmlRegisterType<QQmlDelegateModelGroup>(uri, 2, 1, "DelegateModelGroup"); qmlRegisterType<QQuickPackage>(uri, 2, 0, "Package"); |