diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-05-02 15:13:49 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-05-02 15:14:36 +0200 |
| commit | 44ca7e31ee9365a72cd17ecd335ec4d0161420a9 (patch) | |
| tree | c03b4f8263b41986b6f5d4ac9c6e35e371e98a33 /src/qml/types/types.pri | |
| parent | 580fa7dc88aae23053e44ffa335a15f6af112a20 (diff) | |
| parent | 325e6305b418ffe1dfb9a36c2516c6a8a3de5733 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Ie2b9472ba925df6e6a74727d44d8179557072105
Diffstat (limited to 'src/qml/types/types.pri')
| -rw-r--r-- | src/qml/types/types.pri | 41 |
1 files changed, 2 insertions, 39 deletions
diff --git a/src/qml/types/types.pri b/src/qml/types/types.pri index 5a56208dc4..ba11271d66 100644 --- a/src/qml/types/types.pri +++ b/src/qml/types/types.pri @@ -1,27 +1,12 @@ SOURCES += \ $$PWD/qqmlbind.cpp \ $$PWD/qqmlconnections.cpp \ - $$PWD/qqmlmodelsmodule.cpp \ - $$PWD/qqmlmodelindexvaluetype.cpp \ - $$PWD/qqmlobjectmodel.cpp \ - $$PWD/qquickpackage.cpp \ - $$PWD/qqmlinstantiator.cpp \ - $$PWD/qqmltableinstancemodel.cpp \ - $$PWD/qqmltablemodel.cpp \ - $$PWD/qqmltablemodelcolumn.cpp + $$PWD/qqmlmodelindexvaluetype.cpp HEADERS += \ $$PWD/qqmlbind_p.h \ $$PWD/qqmlconnections_p.h \ - $$PWD/qqmlmodelsmodule_p.h \ - $$PWD/qqmlmodelindexvaluetype_p.h \ - $$PWD/qqmlobjectmodel_p.h \ - $$PWD/qquickpackage_p.h \ - $$PWD/qqmlinstantiator_p.h \ - $$PWD/qqmlinstantiator_p_p.h \ - $$PWD/qqmltableinstancemodel_p.h \ - $$PWD/qqmltablemodel_p.h \ - $$PWD/qqmltablemodelcolumn_p.h + $$PWD/qqmlmodelindexvaluetype_p.h qtConfig(qml-worker-script) { SOURCES += \ @@ -30,28 +15,6 @@ qtConfig(qml-worker-script) { $$PWD/qquickworkerscript_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(qml-delegate-model) { - SOURCES += \ - $$PWD/qqmldelegatemodel.cpp \ - $$PWD/qqmldelegatecomponent.cpp - - HEADERS += \ - $$PWD/qqmldelegatemodel_p.h \ - $$PWD/qqmldelegatemodel_p_p.h \ - $$PWD/qqmldelegatecomponent_p.h -} - qtConfig(qml-animation) { SOURCES += \ $$PWD/qqmltimer.cpp |