1 files changed, 12 insertions, 3 deletions
diff --git a/src/gui/painting/qcolorspace_p.h b/src/gui/painting/qcolorspace_p.h
index 2a40a0cfd8..037111a0ae 100644
--- a/src/gui/painting/qcolorspace_p.h
+++ b/src/gui/painting/qcolorspace_p.h
@@ -95,15 +95,24 @@ public:
     QColorSpacePrivate(const QColorSpacePrimaries &primaries, QColorSpace::TransferFunction fun, float gamma);
     QColorSpacePrivate(const QColorSpacePrivate &other) = default;
 
+    // named different from get to avoid accidental detachs
     static QColorSpacePrivate *getWritable(QColorSpace &colorSpace)
     {
-        colorSpace.d_ptr.detach();
-        return colorSpace.d_ptr.data();
+        if (!colorSpace.d_ptr) {
+            colorSpace.d_ptr = new QColorSpacePrivate;
+            colorSpace.d_ptr->ref.ref();
+        } else if (colorSpace.d_ptr->ref.loadRelaxed() != 1) {
+            colorSpace.d_ptr->ref.deref();
+            colorSpace.d_ptr = new QColorSpacePrivate(*colorSpace.d_ptr);
+            colorSpace.d_ptr->ref.ref();
+        }
+        Q_ASSERT(colorSpace.d_ptr->ref.loadRelaxed() == 1);
+        return colorSpace.d_ptr;
     }
 
     static const QColorSpacePrivate *get(const QColorSpace &colorSpace)
     {
-        return colorSpace.d_ptr.data();
+        return colorSpace.d_ptr;
     }
 
     void initialize();