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/render/geometry/armature.cpp | |
| parent | ecbf5e9a0f331314b554077f3903b621a74f590b (diff) | |
| parent | 3c551b2e2f4f433894d5c70de6e260fddadbb12d (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I45be7ae8399e3b27d1ac55ccfed2fa42a872ac23
Diffstat (limited to 'src/render/geometry/armature.cpp')
| -rw-r--r-- | src/render/geometry/armature.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/render/geometry/armature.cpp b/src/render/geometry/armature.cpp index cfa2e572a..6e417952b 100644 --- a/src/render/geometry/armature.cpp +++ b/src/render/geometry/armature.cpp @@ -38,7 +38,6 @@ #include <Qt3DCore/qarmature.h> #include <Qt3DCore/qabstractskeleton.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/private/qarmature_p.h> |