diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-03-22 09:06:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-03-22 09:06:34 +0100 |
| commit | 115968f291cf802290c3b11b3ec4470646b31168 (patch) | |
| tree | 55fff12104a4ea0b54052c4ec8c70b41b66ee136 /src/qml/types/qqmlmodelsmodule.cpp | |
| parent | bfab67e51e9c030a24a59754842b7f96d6ff77c3 (diff) | |
| parent | 214fbaa57b73296a0a191b5ff2b1fbc8bf0aaa7a (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/qml/configure.json
src/qml/qml/qqmlengine.cpp
src/qml/types/qqmlmodelsmodule.cpp
src/qml/types/types.pri
Change-Id: I390112f8178c99b36741d3c40901e544c6daafaa
Diffstat (limited to 'src/qml/types/qqmlmodelsmodule.cpp')
| -rw-r--r-- | src/qml/types/qqmlmodelsmodule.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/types/qqmlmodelsmodule.cpp b/src/qml/types/qqmlmodelsmodule.cpp index 872d7c059f..d9756704d1 100644 --- a/src/qml/types/qqmlmodelsmodule.cpp +++ b/src/qml/types/qqmlmodelsmodule.cpp @@ -42,7 +42,9 @@ #if QT_CONFIG(qml_list_model) #include <private/qqmllistmodel_p.h> #endif +#if QT_CONFIG(qml_delegate_model) #include <private/qqmldelegatemodel_p.h> +#endif #include <private/qqmlobjectmodel_p.h> QT_BEGIN_NAMESPACE @@ -55,9 +57,11 @@ void QQmlModelsModule::defineModule() qmlRegisterType<QQmlListElement>(uri, 2, 1, "ListElement"); qmlRegisterCustomType<QQmlListModel>(uri, 2, 1, "ListModel", new QQmlListModelParser); #endif +#if QT_CONFIG(qml_delegate_model) qmlRegisterType<QQmlDelegateModel>(uri, 2, 1, "DelegateModel"); qmlRegisterType<QQmlDelegateModel,12>(uri, 2, 9, "DelegateModel"); qmlRegisterType<QQmlDelegateModelGroup>(uri, 2, 1, "DelegateModelGroup"); +#endif qmlRegisterType<QQmlObjectModel>(uri, 2, 1, "ObjectModel"); qmlRegisterType<QQmlObjectModel,3>(uri, 2, 3, "ObjectModel"); |