diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-09-05 11:08:59 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-09-05 11:08:59 +0200 |
| commit | 2746518c76e02c642ff29faf568de4de90216e58 (patch) | |
| tree | 822a6d979c13b6450c221b2a45ccfb6674bcb8e4 /src/qmlmodels | |
| parent | 9e32b23a1514f367921b4a9ee25bc864a008463c (diff) | |
| parent | bdf0a46c289298f7378796d62ae5fb283e08657d (diff) | |
| download | qtdeclarative-wip/qt6.tar.gz | |
Merge remote-tracking branch 'origin/dev' into wip/qt6wip/qt6
Conflicts:
.qmake.conf
src/qml/qml/qqmlengine.cpp
src/qmlmodels/qqmlmodelsmodule.cpp
Change-Id: Id60420f8250a9c97fcfe56d4eea19b62c6870404
Diffstat (limited to 'src/qmlmodels')
| -rw-r--r-- | src/qmlmodels/configure.json | 2 | ||||
| -rw-r--r-- | src/qmlmodels/qqmlmodelsmodule.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qmlmodels/configure.json b/src/qmlmodels/configure.json index 84eefed261..1ccca5e35e 100644 --- a/src/qmlmodels/configure.json +++ b/src/qmlmodels/configure.json @@ -30,7 +30,7 @@ "label": "QML table model", "purpose": "Provides the TableModel QML type.", "section": "QML", - "condition": "features.qml-itemmodel", + "condition": "features.qml-itemmodel && features.qml-delegate-model", "output": [ "privateFeature" ] } }, diff --git a/src/qmlmodels/qqmlmodelsmodule.cpp b/src/qmlmodels/qqmlmodelsmodule.cpp index 884b7f78b2..4b753fe49a 100644 --- a/src/qmlmodels/qqmlmodelsmodule.cpp +++ b/src/qmlmodels/qqmlmodelsmodule.cpp @@ -81,7 +81,7 @@ void QQmlModelsModule::defineModule() qmlRegisterType<QQmlObjectModel>(uri, 2, 1, "ObjectModel"); qmlRegisterType<QQmlObjectModel,3>(uri, 2, 3, "ObjectModel"); qmlRegisterType<QQmlInstantiator>(uri, 2, 1, "Instantiator"); - qmlRegisterType<QQmlInstanceModel>(); + qmlRegisterAnonymousType<QQmlInstanceModel>(uri, 2); #endif #if QT_CONFIG(itemmodel) qmlRegisterType<QItemSelectionModel>(uri, 2, 2, "ItemSelectionModel"); |