From 8b6f4aec9910cfdd347fc3c503d794b585107a2b Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Sun, 17 Jan 2016 12:29:15 +0000 Subject: Fix deprecation warnings Change-Id: I1ec0536ba81c738fc330f7f4c615a4e216645ea0 Reviewed-by: Paul Lemire --- src/render/defaults/qdiffusemapmaterial.cpp | 2 +- src/render/defaults/qdiffusespecularmapmaterial.cpp | 2 +- src/render/defaults/qgoochmaterial.cpp | 2 +- src/render/defaults/qnormaldiffusemapmaterial.cpp | 2 +- src/render/defaults/qnormaldiffusespecularmapmaterial.cpp | 2 +- src/render/defaults/qpervertexcolormaterial.cpp | 2 +- src/render/defaults/qphongalphamaterial.cpp | 2 +- src/render/defaults/qphongmaterial.cpp | 2 +- src/render/defaults/qskyboxentity.cpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/render/defaults/qdiffusemapmaterial.cpp b/src/render/defaults/qdiffusemapmaterial.cpp index eee245739..cb61e1540 100644 --- a/src/render/defaults/qdiffusemapmaterial.cpp +++ b/src/render/defaults/qdiffusemapmaterial.cpp @@ -119,7 +119,7 @@ void QDiffuseMapMaterialPrivate::init() Q_Q(QDiffuseMapMaterial); m_annotation->setParent(q); m_annotation->setName(QStringLiteral("renderingStyle")); - m_annotation->setValue("forward"); + m_annotation->setValue(QStringLiteral("forward")); m_diffuseMapGL3Technique->addAnnotation(m_annotation); m_diffuseMapGL2Technique->addAnnotation(m_annotation); diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp index 18a78db3f..7e5bb760b 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial.cpp +++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp @@ -126,7 +126,7 @@ void QDiffuseSpecularMapMaterialPrivate::init() Q_Q(QDiffuseSpecularMapMaterial); m_annotation->setParent(q); m_annotation->setName(QStringLiteral("renderingStyle")); - m_annotation->setValue("forward"); + m_annotation->setValue(QStringLiteral("forward")); m_diffuseSpecularMapGL3Technique->addAnnotation(m_annotation); m_diffuseSpecularMapGL2Technique->addAnnotation(m_annotation); diff --git a/src/render/defaults/qgoochmaterial.cpp b/src/render/defaults/qgoochmaterial.cpp index 0388dcc4e..6e841e05f 100644 --- a/src/render/defaults/qgoochmaterial.cpp +++ b/src/render/defaults/qgoochmaterial.cpp @@ -116,7 +116,7 @@ void QGoochMaterialPrivate::init() m_annotation->setParent(q); m_annotation->setName(QStringLiteral("renderingStyle")); - m_annotation->setValue("forward"); + m_annotation->setValue(QStringLiteral("forward")); m_gl3Technique->addAnnotation(m_annotation); m_gl2Technique->addAnnotation(m_annotation); diff --git a/src/render/defaults/qnormaldiffusemapmaterial.cpp b/src/render/defaults/qnormaldiffusemapmaterial.cpp index d8c3c25d2..33a4a5196 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial.cpp +++ b/src/render/defaults/qnormaldiffusemapmaterial.cpp @@ -128,7 +128,7 @@ void QNormalDiffuseMapMaterialPrivate::init() Q_Q(QNormalDiffuseMapMaterial); m_annotation->setParent(q); m_annotation->setName(QStringLiteral("renderingStyle")); - m_annotation->setValue("forward"); + m_annotation->setValue(QStringLiteral("forward")); m_normalDiffuseGL3Technique->addAnnotation(m_annotation); m_normalDiffuseGL2Technique->addAnnotation(m_annotation); diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp index 9a16a660d..c5d05e982 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp +++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp @@ -135,7 +135,7 @@ void QNormalDiffuseSpecularMapMaterialPrivate::init() Q_Q(QNormalDiffuseSpecularMapMaterial); m_annotation->setParent(q); m_annotation->setName(QStringLiteral("renderingStyle")); - m_annotation->setValue("forward"); + m_annotation->setValue(QStringLiteral("forward")); m_normalDiffuseSpecularGL3Technique->addAnnotation(m_annotation); m_normalDiffuseSpecularGL2Technique->addAnnotation(m_annotation); diff --git a/src/render/defaults/qpervertexcolormaterial.cpp b/src/render/defaults/qpervertexcolormaterial.cpp index 8cbc42736..2befe59e1 100644 --- a/src/render/defaults/qpervertexcolormaterial.cpp +++ b/src/render/defaults/qpervertexcolormaterial.cpp @@ -136,7 +136,7 @@ void QPerVertexColorMaterialPrivate::init() Q_Q(QPerVertexColorMaterial); m_annotation->setParent(q); m_annotation->setName(QStringLiteral("renderingStyle")); - m_annotation->setValue("forward"); + m_annotation->setValue(QStringLiteral("forward")); m_vertexGL3Technique->addAnnotation(m_annotation); m_vertexGL2Technique->addAnnotation(m_annotation); diff --git a/src/render/defaults/qphongalphamaterial.cpp b/src/render/defaults/qphongalphamaterial.cpp index 01a952319..10fd6b8b7 100644 --- a/src/render/defaults/qphongalphamaterial.cpp +++ b/src/render/defaults/qphongalphamaterial.cpp @@ -119,7 +119,7 @@ void QPhongAlphaMaterialPrivate::init() Q_Q(QPhongAlphaMaterial); m_annotation->setParent(q); m_annotation->setName(QStringLiteral("renderingStyle")); - m_annotation->setValue("forward"); + m_annotation->setValue(QStringLiteral("forward")); m_phongAlphaGL3Technique->addAnnotation(m_annotation); m_phongAlphaGL2Technique->addAnnotation(m_annotation); diff --git a/src/render/defaults/qphongmaterial.cpp b/src/render/defaults/qphongmaterial.cpp index 897bf483d..d61846286 100644 --- a/src/render/defaults/qphongmaterial.cpp +++ b/src/render/defaults/qphongmaterial.cpp @@ -118,7 +118,7 @@ void QPhongMaterialPrivate::init() Q_Q(QPhongMaterial); m_annotation->setParent(q); m_annotation->setName(QStringLiteral("renderingStyle")); - m_annotation->setValue("forward"); + m_annotation->setValue(QStringLiteral("forward")); m_phongGL3Technique->addAnnotation(m_annotation); m_phongGL2Technique->addAnnotation(m_annotation); diff --git a/src/render/defaults/qskyboxentity.cpp b/src/render/defaults/qskyboxentity.cpp index 4c23e6b49..e522ecfa2 100644 --- a/src/render/defaults/qskyboxentity.cpp +++ b/src/render/defaults/qskyboxentity.cpp @@ -115,7 +115,7 @@ void QSkyboxEntityPrivate::init() m_annotation->setParent(m_effect); m_annotation->setName(QStringLiteral("renderingStyle")); - m_annotation->setValue("forward"); + m_annotation->setValue(QStringLiteral("forward")); m_gl3Technique->addAnnotation(m_annotation); m_gl2Technique->addAnnotation(m_annotation); -- cgit v1.2.3