aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/context2d
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2016-09-09 16:20:57 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2016-10-06 14:46:21 +0000
commit57c9d6969ac474177c77d5ea59768b39620a3b2f (patch)
treed7fab7663b43af13f7551e9360a588594b7d21cf /src/quick/items/context2d
parent6c05fe9cb760a9a26d7a1a8037aa62966a3bd344 (diff)
QML: Also check for correct destroy() chaining
Check that the destroy() method of Heap::Base was called when a Managed object needs destruction. This checks if a call to the parent's destroy() method was accidentally omitted. Change-Id: Id025ecd6d4744bf3eab23503fbe317ed2a461138 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/quick/items/context2d')
-rw-r--r--src/quick/items/context2d/qquickcontext2d.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index d94a098897..2483a8eadb 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -504,7 +504,10 @@ struct QQuickContext2DStyle : Object {
patternRepeatX = false;
patternRepeatY = false;
}
- void destroy() { delete brush; }
+ void destroy() {
+ delete brush;
+ Object::destroy();
+ }
QBrush *brush;
bool patternRepeatX:1;
@@ -513,7 +516,10 @@ struct QQuickContext2DStyle : Object {
struct QQuickJSContext2DPixelData : Object {
void init();
- void destroy() { delete image; }
+ void destroy() {
+ delete image;
+ Object::destroy();
+ }
QImage *image;
};