diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
| commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
| tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /tools/utils/qtcreator/templates/wizards/classes/qt3d/file.cpp | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'tools/utils/qtcreator/templates/wizards/classes/qt3d/file.cpp')
| -rw-r--r-- | tools/utils/qtcreator/templates/wizards/classes/qt3d/file.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tools/utils/qtcreator/templates/wizards/classes/qt3d/file.cpp b/tools/utils/qtcreator/templates/wizards/classes/qt3d/file.cpp index 4200859a9..5106a9e74 100644 --- a/tools/utils/qtcreator/templates/wizards/classes/qt3d/file.cpp +++ b/tools/utils/qtcreator/templates/wizards/classes/qt3d/file.cpp @@ -4,7 +4,6 @@ QT_BEGIN_NAMESPACE %{JS: Cpp.openNamespaces('%{Class}')} -@if '%{Base}' === 'QNode' || '%{Base}' === 'QComponent' || '%{Base}' === 'QEntity' %{CN}Private::%{CN}Private() : Qt3DCore::%{Base}Private() { @@ -23,11 +22,7 @@ QT_BEGIN_NAMESPACE %{CN}::~%{CN}() { } -@else -// TODO: Implement QBackendNode template -@endif -@if '%{Base}' === 'QNode' || '%{Base}' === 'QComponent' || '%{Base}' === 'QEntity' Qt3DCore::QNodeCreatedChangeBasePtr %{CN}::createNodeCreationChange() const { auto creationChange = Qt3DCore::QNodeCreatedChangePtr<%{CN}Data>::create(this); @@ -36,7 +31,6 @@ Qt3DCore::QNodeCreatedChangeBasePtr %{CN}::createNodeCreationChange() const // TODO: Send data members in creation change return creationChange; } -@endif %{JS: Cpp.closeNamespaces('%{Class}')}\ QT_END_NAMESPACE |