diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 03:04:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 03:04:13 +0200 |
| commit | 896619133fc338052702ce6f97ba765725f05e43 (patch) | |
| tree | 2b7bd04baf654ebbefabb4a86c1c6352dcc0c03e /src/quick3d | |
| parent | ecbf5e9a0f331314b554077f3903b621a74f590b (diff) | |
| parent | 3c551b2e2f4f433894d5c70de6e260fddadbb12d (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I45be7ae8399e3b27d1ac55ccfed2fa42a872ac23
Diffstat (limited to 'src/quick3d')
| -rw-r--r-- | src/quick3d/quick3dscene2d/items/scene2dmanager.cpp | 2 | ||||
| -rw-r--r-- | src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp b/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp index 1176d8e8e..2b967f2d2 100644 --- a/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp +++ b/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp @@ -40,8 +40,6 @@ #include "scene2dmanager_p.h" #include "scene2devent_p.h" -#include <Qt3DCore/QPropertyUpdatedChange> - QT_BEGIN_NAMESPACE using namespace Qt3DCore; diff --git a/src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp b/src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp index 1dd798d94..cb9973f0a 100644 --- a/src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp +++ b/src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp @@ -41,8 +41,6 @@ #include "scene2devent_p.h" #include "scene2dsharedobject_p.h" -#include <Qt3DCore/QPropertyUpdatedChange> - QT_BEGIN_NAMESPACE using namespace Qt3DCore; |