diff options
| author | Määttä Antti <antti.maatta@qt.io> | 2017-06-19 11:13:41 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2017-06-21 11:03:29 +0000 |
| commit | 927cdc4bde6a152fcd0a64729946831477f27913 (patch) | |
| tree | 48502ba55616b853a2789e7ef247ead0716bc3d0 /src/render/framegraph/qrendercapture_p.h | |
| parent | 920e9ecef384058e8f44eea09dfafda03a9ec435 (diff) | |
Fix QRenderCaptureReply deallocation
Add deallocation guard and set parent of the reply.
Task-number: QTBUG-61508
Change-Id: Ia299450d792b2254c2944472382c8241b271ebf6
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/framegraph/qrendercapture_p.h')
| -rw-r--r-- | src/render/framegraph/qrendercapture_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/render/framegraph/qrendercapture_p.h b/src/render/framegraph/qrendercapture_p.h index 0d7c2d3af..c8253947d 100644 --- a/src/render/framegraph/qrendercapture_p.h +++ b/src/render/framegraph/qrendercapture_p.h @@ -51,6 +51,8 @@ #include <Qt3DRender/qrendercapture.h> #include <Qt3DRender/private/qframegraphnode_p.h> +#include <QtCore/qmutex.h> + QT_BEGIN_NAMESPACE namespace Qt3DRender { @@ -59,11 +61,14 @@ class QRenderCapturePrivate : public QFrameGraphNodePrivate { public: QRenderCapturePrivate(); + ~QRenderCapturePrivate(); QVector<QRenderCaptureReply *> m_waitingReplies; + QMutex m_mutex; QRenderCaptureReply *createReply(int captureId); QRenderCaptureReply *takeReply(int captureId); void setImage(QRenderCaptureReply *reply, const QImage &image); + void replyDestroyed(QRenderCaptureReply *reply); Q_DECLARE_PUBLIC(QRenderCapture) }; |