1 files changed, 9 insertions, 7 deletions
diff --git a/src/gui/painting/qcolorspace_p.h b/src/gui/painting/qcolorspace_p.h
index 037111a0ae..e7add19ed3 100644
--- a/src/gui/painting/qcolorspace_p.h
+++ b/src/gui/painting/qcolorspace_p.h
@@ -62,7 +62,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_GUI_EXPORT QColorSpacePrimaries
+class Q_AUTOTEST_EXPORT QColorSpacePrimaries
 {
 public:
    QColorSpacePrimaries() = default;
@@ -90,7 +90,7 @@ class QColorSpacePrivate : public QSharedData
 {
 public:
     QColorSpacePrivate();
-    QColorSpacePrivate(QColorSpace::ColorSpaceId colorSpaceId);
+    QColorSpacePrivate(QColorSpace::NamedColorSpace namedColorSpace);
     QColorSpacePrivate(QColorSpace::Primaries primaries, QColorSpace::TransferFunction fun, float gamma);
     QColorSpacePrivate(const QColorSpacePrimaries &primaries, QColorSpace::TransferFunction fun, float gamma);
     QColorSpacePrivate(const QColorSpacePrivate &other) = default;
@@ -118,13 +118,15 @@ public:
     void initialize();
     void setToXyzMatrix();
     void setTransferFunction();
-    bool identifyColorSpace();
+    void identifyColorSpace();
     QColorTransform transformationToColorSpace(const QColorSpacePrivate *out) const;
 
-    QColorSpace::ColorSpaceId id;
-    QColorSpace::Primaries primaries;
-    QColorSpace::TransferFunction transferFunction;
-    float gamma;
+    static constexpr QColorSpace::NamedColorSpace Unknown = QColorSpace::NamedColorSpace(0);
+    QColorSpace::NamedColorSpace namedColorSpace = Unknown;
+
+    QColorSpace::Primaries primaries = QColorSpace::Primaries::Custom;
+    QColorSpace::TransferFunction transferFunction = QColorSpace::TransferFunction::Custom;
+    float gamma = 0.0f;
     QColorVector whitePoint;
 
     QColorTrc trc[3];