diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-04-02 10:48:27 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-04-02 11:15:29 +0100 |
| commit | f7934f67f7ca833182ac288bdcb61e0141dfbd84 (patch) | |
| tree | 09b410ecfc7c8f114e2f994796dc41edf636476a /src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp | |
| parent | 3e664bf438d4a3ab9a5f1633f2db171632b777b8 (diff) | |
| parent | c64df4a307aff064433f57805561cb445c0e285f (diff) | |
Merge branch '5.8' into 5.9
Conflicts:
src/core/jobs/qthreadpooler.cpp
src/core/nodes/qcomponent.cpp
src/core/qpostman.cpp
src/core/qscene_p.h
src/core/services/qservicelocator_p.h
src/input/frontend/qinputaspect.cpp
src/plugins/sceneparsers/assimp/assimpimporter.cpp
src/plugins/sceneparsers/assimp/assimpimporter.h
src/plugins/sceneparsers/gltf/gltfimporter.h
src/plugins/sceneparsers/gltf/gltfio.cpp
src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
src/quick3d/quick3dextras/qt3dquickwindow.cpp
Change-Id: I3566708c6f74a34959e7bb64b64e93647ca3f699
Diffstat (limited to 'src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp')
| -rw-r--r-- | src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp b/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp index 6cef032f7..8a4585558 100644 --- a/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp +++ b/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp @@ -38,12 +38,13 @@ ****************************************************************************/ #include "scene3dsgmaterialshader_p.h" -#include "scene3dsgmaterial_p.h" #include <QtGui/qopenglcontext.h> #include <QtGui/qopenglfunctions.h> #include <QtGui/qsurfaceformat.h> +#include <scene3dsgmaterial_p.h> + QT_BEGIN_NAMESPACE namespace { |