diff options
Diffstat (limited to 'src/gui/painting/qcoregraphics_p.h')
| -rw-r--r-- | src/gui/painting/qcoregraphics_p.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/gui/painting/qcoregraphics_p.h b/src/gui/painting/qcoregraphics_p.h index f2c2ba1db1..a35f27a730 100644 --- a/src/gui/painting/qcoregraphics_p.h +++ b/src/gui/painting/qcoregraphics_p.h @@ -26,10 +26,8 @@ #if defined(__OBJC__) # if defined(Q_OS_MACOS) # include <AppKit/AppKit.h> -# define HAVE_APPKIT -# elif defined(Q_OS_IOS) +# elif defined(QT_PLATFORM_UIKIT) # include <UIKit/UIKit.h> -# define HAVE_UIKIT # endif #endif @@ -37,11 +35,11 @@ QT_BEGIN_NAMESPACE Q_GUI_EXPORT CGBitmapInfo qt_mac_bitmapInfoForImage(const QImage &image); -#ifdef HAVE_UIKIT +#ifdef QT_PLATFORM_UIKIT Q_GUI_EXPORT QImage qt_mac_toQImage(const UIImage *image, QSizeF size); #endif -#ifdef HAVE_APPKIT +#ifdef Q_OS_MACOS Q_GUI_EXPORT QPixmap qt_mac_toQPixmap(const NSImage *image, const QSizeF &size); QT_END_NAMESPACE @@ -66,7 +64,7 @@ Q_GUI_EXPORT void qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBou Q_GUI_EXPORT void qt_mac_clip_cg(CGContextRef hd, const QRegion &rgn, CGAffineTransform *orig_xform); -#ifdef HAVE_APPKIT +#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 @@ -90,6 +88,4 @@ private: QT_END_NAMESPACE -#undef HAVE_APPKIT - #endif // QCOREGRAPHICS_P_H |