Merge "Merge remote-tracking branch 'origin/dev' into wip/scenegraphng"wip/scenegraphng

1 files changed, 33 insertions, 21 deletions

diff --git a/src/qmlmodels/qmlmodels.pro b/src/qmlmodels/qmlmodels.pro
index 84f87f8bb1..7d1d9bdf67 100644
--- a/src/qmlmodels/qmlmodels.pro
+++ b/src/qmlmodels/qmlmodels.pro
@@ -5,30 +5,36 @@ DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES QT_NO_FORE
 
 HEADERS += \
     $$PWD/qqmlchangeset_p.h \
-    $$PWD/qqmlinstantiator_p.h \
-    $$PWD/qqmlinstantiator_p_p.h \
-    $$PWD/qqmllistaccessor_p.h \
-    $$PWD/qqmllistcompositor_p.h \
     $$PWD/qqmlmodelsmodule_p.h \
-    $$PWD/qqmlobjectmodel_p.h \
-    $$PWD/qqmltableinstancemodel_p.h \
-    $$PWD/qqmltablemodel_p.h \
-    $$PWD/qqmltablemodelcolumn_p.h \
-    $$PWD/qquickpackage_p.h \
     $$PWD/qtqmlmodelsglobal_p.h \
-    $$PWD/qtqmlmodelsglobal.h \
+    $$PWD/qtqmlmodelsglobal.h
 
 SOURCES += \
     $$PWD/qqmlchangeset.cpp \
-    $$PWD/qqmlinstantiator.cpp \
-    $$PWD/qqmllistaccessor.cpp \
-    $$PWD/qqmllistcompositor.cpp \
-    $$PWD/qqmlmodelsmodule.cpp \
-    $$PWD/qqmlobjectmodel.cpp \
-    $$PWD/qqmltableinstancemodel.cpp \
-    $$PWD/qqmltablemodel.cpp \
-    $$PWD/qqmltablemodelcolumn.cpp \
-    $$PWD/qquickpackage.cpp
+    $$PWD/qqmlmodelsmodule.cpp
+
+qtConfig(qml-object-model) {
+    SOURCES += \
+        $$PWD/qqmlinstantiator.cpp \
+        $$PWD/qqmlobjectmodel.cpp
+
+    HEADERS += \
+        $$PWD/qqmlinstantiator_p.h \
+        $$PWD/qqmlinstantiator_p_p.h \
+        $$PWD/qqmlobjectmodel_p.h
+}
+
+qtConfig(qml-table-model) {
+    SOURCES += \
+        $$PWD/qqmltableinstancemodel.cpp \
+        $$PWD/qqmltablemodel.cpp \
+        $$PWD/qqmltablemodelcolumn.cpp
+
+    HEADERS += \
+        $$PWD/qqmltableinstancemodel_p.h \
+        $$PWD/qqmltablemodel_p.h \
+        $$PWD/qqmltablemodelcolumn_p.h
+}
 
 qtConfig(qml-list-model) {
     SOURCES += \
@@ -45,13 +51,19 @@ qtConfig(qml-delegate-model) {
     SOURCES += \
         $$PWD/qqmladaptormodel.cpp \
         $$PWD/qqmldelegatemodel.cpp \
-        $$PWD/qqmldelegatecomponent.cpp
+        $$PWD/qqmldelegatecomponent.cpp \
+        $$PWD/qqmllistaccessor.cpp \
+        $$PWD/qqmllistcompositor.cpp \
+        $$PWD/qquickpackage.cpp
 
     HEADERS += \
         $$PWD/qqmladaptormodel_p.h \
         $$PWD/qqmldelegatemodel_p.h \
         $$PWD/qqmldelegatemodel_p_p.h \
-        $$PWD/qqmldelegatecomponent_p.h
+        $$PWD/qqmldelegatecomponent_p.h \
+        $$PWD/qqmllistaccessor_p.h \
+        $$PWD/qqmllistcompositor_p.h \
+        $$PWD/qquickpackage_p.h
 }
 
 load(qt_module)