diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-02-10 11:49:19 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-02-10 11:49:19 +0000 |
| commit | 905c5e5a366e24bb6d42b102f2e8a019270baec6 (patch) | |
| tree | 947ba7ee0344be6f2c800fb770eabe123f021b5c /tools/utils/qtcreator/templates/wizards/classes/qt3d/file_p.h | |
| parent | d1271dba68f03610c27e87963653bf1600b5f659 (diff) | |
| parent | e29f8cf68e2f1ed22244f84099589e9444eaf5ba (diff) | |
Merge branch '5.8' into 5.9
Conflicts:
src/render/io/qsceneloader.cpp
src/render/picking/objectpicker.cpp
Change-Id: Ic36138954381820196eb81c5c59e6a91e7f40f33
Diffstat (limited to 'tools/utils/qtcreator/templates/wizards/classes/qt3d/file_p.h')
| -rw-r--r-- | tools/utils/qtcreator/templates/wizards/classes/qt3d/file_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/utils/qtcreator/templates/wizards/classes/qt3d/file_p.h b/tools/utils/qtcreator/templates/wizards/classes/qt3d/file_p.h index 9de21e805..d1acea35e 100644 --- a/tools/utils/qtcreator/templates/wizards/classes/qt3d/file_p.h +++ b/tools/utils/qtcreator/templates/wizards/classes/qt3d/file_p.h @@ -20,8 +20,6 @@ #include <Qt3DCore/private/qcomponent_p.h> @elsif '%{Base}' === 'QEntity' #include <Qt3DCore/private/qentity_p.h> -@elsif '%{Base}' === 'QBackendNode' -#include <Qt3DCore/private/qbackendnode_p.h> @endif QT_BEGIN_NAMESPACE |