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/qqmldelegatemodel_p_p.h | |
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/qqmldelegatemodel_p_p.h')
-rw-r--r-- | src/qml/types/qqmldelegatemodel_p_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/types/qqmldelegatemodel_p_p.h b/src/qml/types/qqmldelegatemodel_p_p.h index 9f1c9d31a4..42481be34f 100644 --- a/src/qml/types/qqmldelegatemodel_p_p.h +++ b/src/qml/types/qqmldelegatemodel_p_p.h @@ -60,6 +60,8 @@ // We mean it. // +QT_REQUIRE_CONFIG(qml_delegate_model); + QT_BEGIN_NAMESPACE typedef QQmlListCompositor Compositor; |