summaryrefslogtreecommitdiffstats
path: root/src/opengl/qopenglshaderprogram.cpp
diff options
context:
space:
mode:
authorMårten Nordheim <[email protected]>2022-03-04 12:28:49 +0100
committerMårten Nordheim <[email protected]>2022-03-08 15:44:17 +0100
commit034d8898f8166423db085da529787e56204c8e15 (patch)
treef58e930c7880d1cd79cd39745ed366d27dcd9e55 /src/opengl/qopenglshaderprogram.cpp
parent87725ee75981ec9ab25456c41acc74681c85ae2e (diff)
Fix deprecated uses of QScopedPointer
By changing it to unique_ptr. Pick-to: 6.2 6.3 Change-Id: I91abb69445b537d4c95983ae735341882352b29d Reviewed-by: Marc Mutz <[email protected]> Reviewed-by: Thiago Macieira <[email protected]>
Diffstat (limited to 'src/opengl/qopenglshaderprogram.cpp')
-rw-r--r--src/opengl/qopenglshaderprogram.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/opengl/qopenglshaderprogram.cpp b/src/opengl/qopenglshaderprogram.cpp
index da3ff392efa..5cb539b5db6 100644
--- a/src/opengl/qopenglshaderprogram.cpp
+++ b/src/opengl/qopenglshaderprogram.cpp
@@ -57,6 +57,7 @@
#endif
#include <algorithm>
+#include <memory>
QT_BEGIN_NAMESPACE
@@ -3761,12 +3762,12 @@ bool QOpenGLShaderProgramPrivate::compileCacheable()
{
Q_Q(QOpenGLShaderProgram);
for (const QOpenGLProgramBinaryCache::ShaderDesc &shader : qAsConst(binaryProgram.shaders)) {
- QScopedPointer<QOpenGLShader> s(new QOpenGLShader(qt_shaderStageToType(shader.stage), q));
+ auto s = std::make_unique<QOpenGLShader>(qt_shaderStageToType(shader.stage), q);
if (!s->compileSourceCode(shader.source)) {
log = s->log();
return false;
}
- anonShaders.append(s.take());
+ anonShaders.append(s.release());
if (!q->addShader(anonShaders.last()))
return false;
}