diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-12-06 16:51:41 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-25 09:41:11 +0100 |
| commit | f3d3c095a6bda505384ef56acab57b985d94fac5 (patch) | |
| tree | 9aefe3b1bb9d26bbdff5d41a53d5f529b506572f /src/gui | |
| parent | 5c3b5efd40b3ab14cc6406a0dca62dfb14b03d46 (diff) | |
Register QColorSpace as a QtGui metatype
Helps pass it through QVariant, and needed for QML support.
Change-Id: Id161ff9b8f81ad55a7ee7a7c4c614bdf74bca4a1
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qguivariant.cpp | 1 | ||||
| -rw-r--r-- | src/gui/painting/qcolorspace.cpp | 9 | ||||
| -rw-r--r-- | src/gui/painting/qcolorspace.h | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp index 596b7e44fd..215b2b1d74 100644 --- a/src/gui/kernel/qguivariant.cpp +++ b/src/gui/kernel/qguivariant.cpp @@ -41,6 +41,7 @@ #include "qbitmap.h" #include "qbrush.h" #include "qcolor.h" +#include "qcolorspace.h" #include "qcursor.h" #include "qfont.h" #include "qimage.h" diff --git a/src/gui/painting/qcolorspace.cpp b/src/gui/painting/qcolorspace.cpp index 0fb0e9ee33..7ebd5f1bf4 100644 --- a/src/gui/painting/qcolorspace.cpp +++ b/src/gui/painting/qcolorspace.cpp @@ -744,6 +744,15 @@ QColorTransform QColorSpace::transformationToColorSpace(const QColorSpace &color return d_ptr->transformationToColorSpace(colorspace.d_ptr); } +/*! + Returns the color space as a QVariant. + \since 5.15 +*/ +QColorSpace::operator QVariant() const +{ + return QVariant(QMetaType::QColorSpace, this); +} + /***************************************************************************** QColorSpace stream functions *****************************************************************************/ diff --git a/src/gui/painting/qcolorspace.h b/src/gui/painting/qcolorspace.h index e6bc62d58a..08c9944301 100644 --- a/src/gui/painting/qcolorspace.h +++ b/src/gui/painting/qcolorspace.h @@ -44,6 +44,7 @@ #include <QtGui/qcolortransform.h> #include <QtCore/qobjectdefs.h> #include <QtCore/qshareddata.h> +#include <QtCore/qvariant.h> QT_BEGIN_NAMESPACE @@ -125,6 +126,7 @@ public: QColorTransform transformationToColorSpace(const QColorSpace &colorspace) const; + operator QVariant() const; private: Q_DECLARE_PRIVATE(QColorSpace) |