diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2016-09-13 12:15:49 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2016-09-18 11:38:54 +0000 |
| commit | 5ad8b3aa32f7a085a97cbe95060551dff8ac726f (patch) | |
| tree | 6405714c3f3f8d02a67fb1d2b01d3ec35008a7e2 /src/gui/painting/qcoregraphics_p.h | |
| parent | 49b3510bb929f37f1c549f25e999c42521f9a5fa (diff) | |
macOS: Move QColor/QBrush conversion functions to QtGui
Change-Id: I971d1d69b491532fd0dc0bab72b274dec6591e6b
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/gui/painting/qcoregraphics_p.h')
| -rw-r--r-- | src/gui/painting/qcoregraphics_p.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/painting/qcoregraphics_p.h b/src/gui/painting/qcoregraphics_p.h index b2b29ecf76..ab2579387e 100644 --- a/src/gui/painting/qcoregraphics_p.h +++ b/src/gui/painting/qcoregraphics_p.h @@ -47,6 +47,7 @@ #include <QtGui/private/qtguiglobal_p.h> #include <QtGui/qregion.h> +#include <QtGui/qpalette.h> #include <CoreGraphics/CoreGraphics.h> #ifdef Q_OS_MACOS @@ -71,6 +72,13 @@ Q_GUI_EXPORT CGColorSpaceRef qt_mac_colorSpaceForDeviceType(const QPaintDevice * Q_GUI_EXPORT void qt_mac_clip_cg(CGContextRef hd, const QRegion &rgn, CGAffineTransform *orig_xform); +#ifdef Q_OS_MACOS +Q_GUI_EXPORT QColor qt_mac_toQColor(const NSColor *color); +Q_GUI_EXPORT QBrush qt_mac_toQBrush(const NSColor *color, QPalette::ColorGroup colorGroup = QPalette::Normal); +#endif +Q_GUI_EXPORT QColor qt_mac_toQColor(CGColorRef color); +Q_GUI_EXPORT QBrush qt_mac_toQBrush(CGColorRef color); + class Q_GUI_EXPORT QMacCGContext { public: |