Fixes leak introduced by QScopedPointer

QPainterPath is kinda evil with a somewhat public private class and a
really private cast, so we need to up-cast the d pointer when deleting.

RevBy: aportale

1 files changed, 18 insertions, 0 deletions

diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp
index 12dbc62fcc..635218e271 100644
--- a/src/gui/painting/qpainterpath.cpp
+++ b/src/gui/painting/qpainterpath.cpp
@@ -73,6 +73,24 @@
 
 QT_BEGIN_NAMESPACE
 
+struct QPainterPathPrivateHandler
+{
+    static inline void cleanup(QPainterPathPrivate *d)
+    {
+        // note - we must up-cast to QPainterPathData since QPainterPathPrivate
+        // has a non-virtual destructor!
+        if (d && !d->ref.deref())
+            delete static_cast<QPainterPathData *>(d);
+    }
+
+    static inline void reset(QPainterPathPrivate *&d, QPainterPathPrivate *other)
+    {
+        QPainterPathPrivate *oldD = d;
+        d = other;
+        cleanup(oldD);
+    }
+};
+
 // This value is used to determine the length of control point vectors
 // when approximating arc segments as curves. The factor is multiplied
 // with the radius of the circle.