diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-06-02 08:32:40 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-02 20:06:31 +0200 |
| commit | 5408afb2e0e078c79693f718077c89801cfc5dfc (patch) | |
| tree | 45bec5ad4c9e3341fab37f81d65686096489f8a9 /src/core/nodes/nodes.pri | |
| parent | a88a968dec04cb467fc4d5ffccef219a3bc93241 (diff) | |
Removed EntityNode
Entity and EntityNode are back to being the same class. This is ground work
needed to have a QML API based on extending C++ types rather than having two
distincts API subclassing common interfaces.
Note: this patch won't properly compile alone. It should be staged with
follow-up patches.
Change-Id: Icd98c6c687ca06f18056ebd7a2d6555a7ba7ffa3
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/nodes/nodes.pri')
| -rw-r--r-- | src/core/nodes/nodes.pri | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/nodes/nodes.pri b/src/core/nodes/nodes.pri index 9d950271e..36a8ece78 100644 --- a/src/core/nodes/nodes.pri +++ b/src/core/nodes/nodes.pri @@ -4,12 +4,10 @@ HEADERS += \ $$PWD/node.h \ $$PWD/nodevisitor.h \ $$PWD/component.h \ - $$PWD/entity.h \ - $$PWD/entitynode.h + $$PWD/entity.h SOURCES += \ $$PWD/node.cpp \ $$PWD/nodevisitor.cpp \ $$PWD/component.cpp \ - $$PWD/entity.cpp \ - $$PWD/entitynode.cpp + $$PWD/entity.cpp |