diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-23 09:33:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-23 09:33:53 +0200 |
| commit | ec2c6c0f13004bc1bba92f14443228778da287a0 (patch) | |
| tree | 5c4e2621091ad7bbd31e6ffb6a277c1aaee39b55 /src/quick3d/quick3drender/items/quick3dshaderdata.cpp | |
| parent | 5476bc6b4b6a12c921da502c24c4e078b04dd3b3 (diff) | |
| parent | 0e3d54f8d7f9be26687afebcc9f456e4cefc2357 (diff) | |
Merge remote-tracking branch 'origin/5.8' into devwip/particles
Change-Id: I4e1c528eb8e1c81aead51a5664635ca2becad397
Diffstat (limited to 'src/quick3d/quick3drender/items/quick3dshaderdata.cpp')
| -rw-r--r-- | src/quick3d/quick3drender/items/quick3dshaderdata.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp index e5901e8fb..dbf351695 100644 --- a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp +++ b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp @@ -37,12 +37,12 @@ ** ****************************************************************************/ -#include "quick3dshaderdata_p.h" -#include <private/qshaderdata_p.h> - #include <Qt3DQuickRender/private/quick3dshaderdataarray_p.h> #include <QMetaProperty> +#include "quick3dshaderdata_p.h" +#include <private/qshaderdata_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DRender { |