diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-05-11 10:24:18 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-05-11 11:13:04 +0200 |
| commit | 809d305f938177cfb8488dc7fbfc28bc8eef9d20 (patch) | |
| tree | d43688a9a3ef61af95c91bae3de8b00e6466c817 /src/qml/types/types.pri | |
| parent | b742bf9415b42c6e34fab91d2f407eb23dc8e0da (diff) | |
| parent | 1e82f11629e5572783e5bfc36f24ad10c235ca53 (diff) | |
Merge remote-tracking branch 'origin/5.11.0' into wip/webassembly
Change-Id: Ice58db1687c0cfbd5a19e84ca9fa81b8d3fa7959
Diffstat (limited to 'src/qml/types/types.pri')
| -rw-r--r-- | src/qml/types/types.pri | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/qml/types/types.pri b/src/qml/types/types.pri index e85ab5982b..8bcbd6e544 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/qqmllistmodel.cpp \ $$PWD/qqmllistmodelworkeragent.cpp \ $$PWD/qqmlmodelsmodule.cpp \ @@ -14,8 +13,6 @@ SOURCES += \ HEADERS += \ $$PWD/qqmlbind_p.h \ $$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 \ @@ -27,6 +24,15 @@ HEADERS += \ $$PWD/qqmlinstantiator_p.h \ $$PWD/qqmlinstantiator_p_p.h +qtConfig(qml-delegate-model) { + SOURCES += \ + $$PWD/qqmldelegatemodel.cpp + + HEADERS += \ + $$PWD/qqmldelegatemodel_p.h \ + $$PWD/qqmldelegatemodel_p_p.h +} + qtConfig(animation) { SOURCES += \ $$PWD/qqmltimer.cpp |