1 files changed, 13 insertions, 7 deletions
diff --git a/src/gui/painting/qcolorspace.h b/src/gui/painting/qcolorspace.h
index 07f1ae4c31..d31bf1a326 100644
--- a/src/gui/painting/qcolorspace.h
+++ b/src/gui/painting/qcolorspace.h
@@ -51,6 +51,8 @@ QT_BEGIN_NAMESPACE
 class QColorSpacePrivate;
 class QPointF;
 
+QT_DECLARE_QESDP_SPECIALIZATION_DTOR_WITH_EXPORT(QColorSpacePrivate, Q_GUI_EXPORT)
+
 class Q_GUI_EXPORT QColorSpace
 {
     Q_GADGET
@@ -80,7 +82,7 @@ public:
     };
     Q_ENUM(TransferFunction)
 
-    QColorSpace();
+    QColorSpace() noexcept = default;
     QColorSpace(NamedColorSpace namedColorSpace);
     QColorSpace(Primaries primaries, TransferFunction fun, float gamma = 0.0f);
     QColorSpace(Primaries primaries, float gamma);
@@ -89,12 +91,15 @@ public:
                 TransferFunction fun, float gamma = 0.0f);
     ~QColorSpace();
 
-    QColorSpace(const QColorSpace &colorSpace);
-    QColorSpace &operator=(const QColorSpace &colorSpace);
+    QColorSpace(const QColorSpace &colorSpace) noexcept;
+    QColorSpace &operator=(const QColorSpace &colorSpace) noexcept
+    {
+        QColorSpace copy(colorSpace);
+        swap(copy);
+        return *this;
+    }
 
-    QColorSpace(QColorSpace &&colorSpace) noexcept
-            : d_ptr(qExchange(colorSpace.d_ptr, nullptr))
-    { }
+    QColorSpace(QColorSpace &&colorSpace) noexcept = default;
     QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(QColorSpace)
 
     void swap(QColorSpace &colorSpace) noexcept
@@ -111,6 +116,7 @@ public:
     void setPrimaries(const QPointF &whitePoint, const QPointF &redPoint,
                       const QPointF &greenPoint, const QPointF &bluePoint);
 
+    void detach();
     bool isValid() const noexcept;
 
     friend Q_GUI_EXPORT bool operator==(const QColorSpace &colorSpace1, const QColorSpace &colorSpace2);
@@ -125,7 +131,7 @@ public:
 
 private:
     friend class QColorSpacePrivate;
-    QColorSpacePrivate *d_ptr = nullptr;
+    QExplicitlySharedDataPointer<QColorSpacePrivate> d_ptr;
 
 #ifndef QT_NO_DEBUG_STREAM
     friend Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QColorSpace &colorSpace);