6 files changed, 24 insertions, 5 deletions
diff --git a/src/qml/types/qqmllistmodel_p.h b/src/qml/types/qqmllistmodel_p.h
index cbb12caa20..147b845047 100644
--- a/src/qml/types/qqmllistmodel_p.h
+++ b/src/qml/types/qqmllistmodel_p.h
@@ -64,6 +64,8 @@
 #include <private/qv4engine_p.h>
 #include <private/qpodvector_p.h>
 
+QT_REQUIRE_CONFIG(qml_list_model);
+
 QT_BEGIN_NAMESPACE
 
 
diff --git a/src/qml/types/qqmllistmodel_p_p.h b/src/qml/types/qqmllistmodel_p_p.h
index 81b9956ecb..01375da109 100644
--- a/src/qml/types/qqmllistmodel_p_p.h
+++ b/src/qml/types/qqmllistmodel_p_p.h
@@ -57,6 +57,8 @@
 #include <private/qv4qobjectwrapper_p.h>
 #include <qqml.h>
 
+QT_REQUIRE_CONFIG(qml_list_model);
+
 QT_BEGIN_NAMESPACE
 
 
diff --git a/src/qml/types/qqmllistmodelworkeragent_p.h b/src/qml/types/qqmllistmodelworkeragent_p.h
index 761a467e89..6973f55426 100644
--- a/src/qml/types/qqmllistmodelworkeragent_p.h
+++ b/src/qml/types/qqmllistmodelworkeragent_p.h
@@ -59,6 +59,8 @@
 
 #include <private/qv8engine_p.h>
 
+QT_REQUIRE_CONFIG(qml_list_model);
+
 QT_BEGIN_NAMESPACE
 
 
diff --git a/src/qml/types/qqmlmodelsmodule.cpp b/src/qml/types/qqmlmodelsmodule.cpp
index a55d7af25d..872d7c059f 100644
--- a/src/qml/types/qqmlmodelsmodule.cpp
+++ b/src/qml/types/qqmlmodelsmodule.cpp
@@ -39,7 +39,9 @@
 
 #include "qqmlmodelsmodule_p.h"
 #include <QtCore/qitemselectionmodel.h>
+#if QT_CONFIG(qml_list_model)
 #include <private/qqmllistmodel_p.h>
+#endif
 #include <private/qqmldelegatemodel_p.h>
 #include <private/qqmlobjectmodel_p.h>
 
@@ -49,8 +51,10 @@ void QQmlModelsModule::defineModule()
 {
     const char uri[] = "QtQml.Models";
 
+#if QT_CONFIG(qml_list_model)
     qmlRegisterType<QQmlListElement>(uri, 2, 1, "ListElement");
     qmlRegisterCustomType<QQmlListModel>(uri, 2, 1, "ListModel", new QQmlListModelParser);
+#endif
     qmlRegisterType<QQmlDelegateModel>(uri, 2, 1, "DelegateModel");
     qmlRegisterType<QQmlDelegateModel,12>(uri, 2, 9, "DelegateModel");
     qmlRegisterType<QQmlDelegateModelGroup>(uri, 2, 1, "DelegateModelGroup");
diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp
index a9039cc4b9..85afcf915b 100644
--- a/src/qml/types/qquickworkerscript.cpp
+++ b/src/qml/types/qquickworkerscript.cpp
@@ -37,9 +37,12 @@
 **
 ****************************************************************************/
 
+#include "qtqmlglobal_p.h"
 #include "qquickworkerscript_p.h"
+#if QT_CONFIG(qml_list_model)
 #include "qqmllistmodel_p.h"
 #include "qqmllistmodelworkeragent_p.h"
+#endif
 #include <private/qqmlengine_p.h>
 #include <private/qqmlexpression_p.h>
 
diff --git a/src/qml/types/types.pri b/src/qml/types/types.pri
index e85ab5982b..574e7c214d 100644
--- a/src/qml/types/types.pri
+++ b/src/qml/types/types.pri
@@ -2,8 +2,6 @@ SOURCES += \
     $$PWD/qqmlbind.cpp \
     $$PWD/qqmlconnections.cpp \
     $$PWD/qqmldelegatemodel.cpp \
-    $$PWD/qqmllistmodel.cpp \
-    $$PWD/qqmllistmodelworkeragent.cpp \
     $$PWD/qqmlmodelsmodule.cpp \
     $$PWD/qqmlmodelindexvaluetype.cpp \
     $$PWD/qqmlobjectmodel.cpp \
@@ -16,9 +14,6 @@ HEADERS += \
     $$PWD/qqmlconnections_p.h \
     $$PWD/qqmldelegatemodel_p.h \
     $$PWD/qqmldelegatemodel_p_p.h \
-    $$PWD/qqmllistmodel_p.h \
-    $$PWD/qqmllistmodel_p_p.h \
-    $$PWD/qqmllistmodelworkeragent_p.h \
     $$PWD/qqmlmodelsmodule_p.h \
     $$PWD/qqmlmodelindexvaluetype_p.h \
     $$PWD/qqmlobjectmodel_p.h \
@@ -27,6 +22,17 @@ HEADERS += \
     $$PWD/qqmlinstantiator_p.h \
     $$PWD/qqmlinstantiator_p_p.h
 
+qtConfig(qml-list-model) {
+    SOURCES += \
+        $$PWD/qqmllistmodel.cpp \
+        $$PWD/qqmllistmodelworkeragent.cpp
+
+    HEADERS += \
+        $$PWD/qqmllistmodel_p.h \
+        $$PWD/qqmllistmodel_p_p.h \
+        $$PWD/qqmllistmodelworkeragent_p.h
+}
+
 qtConfig(animation) {
     SOURCES += \
         $$PWD/qqmltimer.cpp