diff options
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qregion.h | 7 | ||||
| -rw-r--r-- | src/gui/painting/qtextureglyphcache.cpp | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h index 75d29e1ef5..d1ec9c6c34 100644 --- a/src/gui/painting/qregion.h +++ b/src/gui/painting/qregion.h @@ -152,13 +152,8 @@ public: RgnHandle toQDRgnForUpdate_sys() const; static QRegion fromQDRgn(RgnHandle shape); #endif -#ifdef QT_MAC_USE_COCOA inline HIMutableShapeRef handle(bool unused = false) const { Q_UNUSED(unused); return toHIMutableShape(); } -#else - inline RgnHandle handle() const { return handle(false); } - inline RgnHandle handle(bool) const { return toQDRgn(); } -#endif HIMutableShapeRef toHIMutableShape() const; static QRegion fromHIShapeRef(HIShapeRef shape); #elif defined(Q_WS_QWS) || defined(Q_WS_QPA) @@ -201,8 +196,6 @@ Q_GUI_EXPORT #elif defined(Q_WS_X11) Region rgn; void *xrectangles; -#elif defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA) - mutable RgnHandle unused; // Here for binary compatibility reasons. ### Qt 5 remove. #endif #if defined(Q_WS_QWS) || defined(Q_WS_QPA) || defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN) QRegionPrivate *qt_rgn; diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp index 665efe07f2..0f9a82c25a 100644 --- a/src/gui/painting/qtextureglyphcache.cpp +++ b/src/gui/painting/qtextureglyphcache.cpp @@ -367,7 +367,7 @@ void QImageTextureGlyphCache::createTextureData(int width, int height) int QImageTextureGlyphCache::glyphMargin() const { -#if (defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)) || defined(Q_WS_X11) +#if defined(Q_WS_MAC) || defined(Q_WS_X11) return 0; #else return m_type == QFontEngineGlyphCache::Raster_RGBMask ? 2 : 0; |