Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"

1 files changed, 14 insertions, 3 deletions

diff --git a/src/gui/painting/qcolorspace_p.h b/src/gui/painting/qcolorspace_p.h
index 95e0655d0c..2a40a0cfd8 100644
--- a/src/gui/painting/qcolorspace_p.h
+++ b/src/gui/painting/qcolorspace_p.h
@@ -66,7 +66,7 @@ class Q_GUI_EXPORT QColorSpacePrimaries
 {
 public:
    QColorSpacePrimaries() = default;
-   QColorSpacePrimaries(QColorSpace::Gamut gamut);
+   QColorSpacePrimaries(QColorSpace::Primaries primaries);
    QColorSpacePrimaries(QPointF whitePoint,
                         QPointF redPoint,
                         QPointF greenPoint,
@@ -91,10 +91,21 @@ class QColorSpacePrivate : public QSharedData
 public:
     QColorSpacePrivate();
     QColorSpacePrivate(QColorSpace::ColorSpaceId colorSpaceId);
-    QColorSpacePrivate(QColorSpace::Gamut gamut, QColorSpace::TransferFunction fun, float gamma);
+    QColorSpacePrivate(QColorSpace::Primaries primaries, QColorSpace::TransferFunction fun, float gamma);
     QColorSpacePrivate(const QColorSpacePrimaries &primaries, QColorSpace::TransferFunction fun, float gamma);
     QColorSpacePrivate(const QColorSpacePrivate &other) = default;
 
+    static QColorSpacePrivate *getWritable(QColorSpace &colorSpace)
+    {
+        colorSpace.d_ptr.detach();
+        return colorSpace.d_ptr.data();
+    }
+
+    static const QColorSpacePrivate *get(const QColorSpace &colorSpace)
+    {
+        return colorSpace.d_ptr.data();
+    }
+
     void initialize();
     void setToXyzMatrix();
     void setTransferFunction();
@@ -102,7 +113,7 @@ public:
     QColorTransform transformationToColorSpace(const QColorSpacePrivate *out) const;
 
     QColorSpace::ColorSpaceId id;
-    QColorSpace::Gamut gamut;
+    QColorSpace::Primaries primaries;
     QColorSpace::TransferFunction transferFunction;
     float gamma;
     QColorVector whitePoint;