From f8ab61438164a828e2f0c6e9e4a5cdeaa7b6a62c Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 14 Oct 2019 10:20:33 +0200 Subject: renderviewjobutils.cpp: Remove unnecessary string conversion Remove call to toLatin1(), fixing: enderers/opengl/jobs/renderviewjobutils.cpp: In member function 'void Qt3DRender::Render::UniformBlockValueBuilder::buildActiveUniformNameValueMapHelper(Qt3DRender::Render::ShaderData*, const QString&, const QString&, const QVariant&)': renderers/opengl/jobs/renderviewjobutils.cpp:516:126: warning: 'QString::QString(const QByteArray&)' is deprecated: Use fromUtf8, QStringLiteral, or QLatin1String [-Wdeprecated-declarations] Change-Id: I71afa2b29e7af6cb3acad008822b369acc66bed3 Reviewed-by: Paul Lemire --- src/render/renderers/opengl/jobs/renderviewjobutils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/render/renderers/opengl/jobs/renderviewjobutils.cpp b/src/render/renderers/opengl/jobs/renderviewjobutils.cpp index fee1cc4b5..cc211ba68 100644 --- a/src/render/renderers/opengl/jobs/renderviewjobutils.cpp +++ b/src/render/renderers/opengl/jobs/renderviewjobutils.cpp @@ -513,7 +513,7 @@ void UniformBlockValueBuilder::buildActiveUniformNameValueMapHelper(ShaderData * // the shaderdata cannot hold transformed properties for multiple // thread contexts at once activeUniformNamesToValue.insert(StringToInt::lookupId(varName), - currentShaderData->getTransformedProperty(qmlPropertyName.toLatin1(), viewMatrix)); + currentShaderData->getTransformedProperty(qmlPropertyName, viewMatrix)); } } } -- cgit v1.2.3