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

2 files changed, 10 insertions, 2 deletions

diff --git a/src/qml/util/qqmladaptormodel_p.h b/src/qml/util/qqmladaptormodel_p.h
index f0d3bcd186..d3b26a1ad5 100644
--- a/src/qml/util/qqmladaptormodel_p.h
+++ b/src/qml/util/qqmladaptormodel_p.h
@@ -58,6 +58,8 @@
 #include <private/qqmlguard_p.h>
 #include <private/qqmlnullablevalue_p.h>
 
+QT_REQUIRE_CONFIG(qml_delegate_model);
+
 QT_BEGIN_NAMESPACE
 
 class QQmlEngine;
diff --git a/src/qml/util/util.pri b/src/qml/util/util.pri
index a9c5ffe9b7..bebb271f1b 100644
--- a/src/qml/util/util.pri
+++ b/src/qml/util/util.pri
@@ -2,12 +2,18 @@ SOURCES += \
     $$PWD/qqmlchangeset.cpp \
     $$PWD/qqmllistaccessor.cpp \
     $$PWD/qqmllistcompositor.cpp \
-    $$PWD/qqmladaptormodel.cpp \
     $$PWD/qqmlpropertymap.cpp
 
 HEADERS += \
     $$PWD/qqmlchangeset_p.h \
     $$PWD/qqmllistaccessor_p.h \
     $$PWD/qqmllistcompositor_p.h \
-    $$PWD/qqmladaptormodel_p.h \
     $$PWD/qqmlpropertymap.h
+
+qtConfig(qml-delegate-model) {
+    SOURCES += \
+        $$PWD/qqmladaptormodel.cpp
+
+    HEADERS += \
+        $$PWD/qqmladaptormodel_p.h
+}