diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:21:42 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:21:42 +0200 |
| commit | 6a0bb9a7d6a6473920da74bb48c52a4eaed990b0 (patch) | |
| tree | 3a32c56b1fe21c96d5982511e0b4815c1c07dfbb /src/qmlmodels | |
| parent | f0d23d3ff9da26a71295a6abd356c8d366d17439 (diff) | |
| parent | 2746518c76e02c642ff29faf568de4de90216e58 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I4a91928610f79c8e21a05781953ffa41508c828a
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"); |