diff options
author | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-04-15 16:51:04 +0200 |
---|---|---|
committer | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-05-03 06:58:44 +0000 |
commit | 6efa3215a2724415ec7c11e3631594ada1b722b0 (patch) | |
tree | 8c9d3b0c07921380c2320a26086dd6e5f30a8edd /src/gui | |
parent | cb320925b9b4c33ffbdac73597bf78db842109c9 (diff) |
QOpenGLCustomShaderStage - fix a memory leak
Coverity found a memory leak - CID-10995. Fix a dtor + make copy constructor
/ assignment operator private (Q_DISABLE_COPY).
Change-Id: I4f046d075b60fbfb69f350e4a4d8b07ea1643914
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/opengl/qopenglcustomshaderstage.cpp | 1 | ||||
-rw-r--r-- | src/gui/opengl/qopenglcustomshaderstage_p.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/opengl/qopenglcustomshaderstage.cpp b/src/gui/opengl/qopenglcustomshaderstage.cpp index e0d131e64d..e5504e6195 100644 --- a/src/gui/opengl/qopenglcustomshaderstage.cpp +++ b/src/gui/opengl/qopenglcustomshaderstage.cpp @@ -63,6 +63,7 @@ QOpenGLCustomShaderStage::~QOpenGLCustomShaderStage() d->m_manager->removeCustomStage(); d->m_manager->sharedShaders->cleanupCustomStage(this); } + delete d_ptr; } void QOpenGLCustomShaderStage::setUniformsDirty() diff --git a/src/gui/opengl/qopenglcustomshaderstage_p.h b/src/gui/opengl/qopenglcustomshaderstage_p.h index 78c414d316..9b3c9fbce1 100644 --- a/src/gui/opengl/qopenglcustomshaderstage_p.h +++ b/src/gui/opengl/qopenglcustomshaderstage_p.h @@ -46,6 +46,7 @@ // #include <QOpenGLShaderProgram> +#include <QtGlobal> QT_BEGIN_NAMESPACE @@ -72,6 +73,8 @@ protected: private: QOpenGLCustomShaderStagePrivate* d_ptr; + + Q_DISABLE_COPY(QOpenGLCustomShaderStage) }; |