diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-10-14 10:20:33 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-10-14 11:23:17 +0200 |
| commit | f8ab61438164a828e2f0c6e9e4a5cdeaa7b6a62c (patch) | |
| tree | ad05a4c1af943e8b71821c0f9d0e48866c0e59ae | |
| parent | c8134efd470482e2254e7b232deb386828af5610 (diff) | |
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 <paul.lemire@kdab.com>
| -rw-r--r-- | src/render/renderers/opengl/jobs/renderviewjobutils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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)); } } } |