summaryrefslogtreecommitdiffstats
path: root/src/qml/types/types.pri
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-03-22 09:06:34 +0100
committerLiang Qi <liang.qi@qt.io>2018-03-22 09:06:34 +0100
commit115968f291cf802290c3b11b3ec4470646b31168 (patch)
tree55fff12104a4ea0b54052c4ec8c70b41b66ee136 /src/qml/types/types.pri
parentbfab67e51e9c030a24a59754842b7f96d6ff77c3 (diff)
parent214fbaa57b73296a0a191b5ff2b1fbc8bf0aaa7a (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/types.pri')
-rw-r--r--src/qml/types/types.pri12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/qml/types/types.pri b/src/qml/types/types.pri
index 25b231f954..5d75759281 100644
--- a/src/qml/types/types.pri
+++ b/src/qml/types/types.pri
@@ -1,7 +1,6 @@
SOURCES += \
$$PWD/qqmlbind.cpp \
$$PWD/qqmlconnections.cpp \
- $$PWD/qqmldelegatemodel.cpp \
$$PWD/qqmlmodelsmodule.cpp \
$$PWD/qqmlmodelindexvaluetype.cpp \
$$PWD/qqmlobjectmodel.cpp \
@@ -12,8 +11,6 @@ SOURCES += \
HEADERS += \
$$PWD/qqmlbind_p.h \
$$PWD/qqmlconnections_p.h \
- $$PWD/qqmldelegatemodel_p.h \
- $$PWD/qqmldelegatemodel_p_p.h \
$$PWD/qqmlmodelsmodule_p.h \
$$PWD/qqmlmodelindexvaluetype_p.h \
$$PWD/qqmlobjectmodel_p.h \
@@ -33,6 +30,15 @@ qtConfig(qml-list-model) {
$$PWD/qqmllistmodelworkeragent_p.h
}
+qtConfig(qml-delegate-model) {
+ SOURCES += \
+ $$PWD/qqmldelegatemodel.cpp
+
+ HEADERS += \
+ $$PWD/qqmldelegatemodel_p.h \
+ $$PWD/qqmldelegatemodel_p_p.h
+}
+
qtConfig(qml-animation) {
SOURCES += \
$$PWD/qqmltimer.cpp