Merge branch 'dev' into wip/animationwip/animation

Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f

1 files changed, 5 insertions, 1 deletions

diff --git a/src/extras/defaults/qskyboxentity_p.h b/src/extras/defaults/qskyboxentity_p.h
index effe97fce..88a40e2eb 100644
--- a/src/extras/defaults/qskyboxentity_p.h
+++ b/src/extras/defaults/qskyboxentity_p.h
@@ -51,8 +51,9 @@
 // We mean it.
 //
 
+#include <QtGui/QVector3D>
+
 #include <Qt3DCore/private/qentity_p.h>
-#include <QVector3D>
 
 QT_BEGIN_NAMESPACE
 
@@ -60,6 +61,7 @@ namespace Qt3DRender {
 
 class QFilterKey;
 class QTextureCubeMap;
+class QTextureLoader;
 class QShaderProgram;
 class QSkyboxEntity;
 class QTextureImage;
@@ -87,6 +89,7 @@ class QSkyboxEntityPrivate : public Qt3DCore::QEntityPrivate
     Qt3DRender::QEffect *m_effect;
     Qt3DRender::QMaterial *m_material;
     Qt3DRender::QTextureCubeMap *m_skyboxTexture;
+    Qt3DRender::QTextureLoader *m_loadedTexture;
     Qt3DRender::QShaderProgram *m_gl3Shader;
     Qt3DRender::QShaderProgram *m_gl2es2Shader;
     Qt3DRender::QTechnique *m_gl2Technique;
@@ -97,6 +100,7 @@ class QSkyboxEntityPrivate : public Qt3DCore::QEntityPrivate
     Qt3DRender::QRenderPass *m_es2RenderPass;
     Qt3DRender::QRenderPass *m_gl3RenderPass;
     QCuboidMesh *m_mesh;
+    Qt3DRender::QParameter *m_gammaStrengthParameter;
     Qt3DRender::QParameter *m_textureParameter;
     Qt3DRender::QTextureImage *m_posXImage;
     Qt3DRender:: QTextureImage *m_posYImage;