Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	src/gui/painting/qcoregraphics.mm
	src/network/access/qnetworkrequest.h
	src/plugins/platforms/cocoa/qcocoahelpers.mm

Change-Id: I81266414c06ea2edf63cbc7e93a86bd5d66a31a5

43 files changed, 246 insertions, 671 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.h b/src/plugins/platforms/cocoa/qcocoabackingstore.h
index 52a3e756b9..562be2be8f 100644
--- a/src/plugins/platforms/cocoa/qcocoabackingstore.h
+++ b/src/plugins/platforms/cocoa/qcocoabackingstore.h
@@ -40,33 +40,20 @@
 #ifndef QBACKINGSTORE_COCOA_H
 #define QBACKINGSTORE_COCOA_H
 
-#include <AppKit/AppKit.h>
-
-#include "qcocoawindow.h"
-#include "qnsview.h"
-
-#include <qpa/qplatformbackingstore.h>
+#include <QtPlatformSupport/private/qrasterbackingstore_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QCocoaBackingStore : public QPlatformBackingStore
+class QCocoaBackingStore : public QRasterBackingStore
 {
 public:
     QCocoaBackingStore(QWindow *window);
     ~QCocoaBackingStore();
 
-    QPaintDevice *paintDevice() Q_DECL_OVERRIDE;
-    void flush(QWindow *widget, const QRegion &region, const QPoint &offset) Q_DECL_OVERRIDE;
-    QImage toImage() const Q_DECL_OVERRIDE;
-
-    void resize (const QSize &size, const QRegion &) Q_DECL_OVERRIDE;
-    bool scroll(const QRegion &area, int dx, int dy) Q_DECL_OVERRIDE;
-    void beginPaint(const QRegion &region) Q_DECL_OVERRIDE;
-    qreal getBackingStoreDevicePixelRatio();
+    void flush(QWindow *, const QRegion &, const QPoint &) Q_DECL_OVERRIDE;
 
 private:
-    QImage m_qImage;
-    QSize m_requestedSize;
+    QImage::Format format() const Q_DECL_OVERRIDE;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.mm b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
index 20233518b3..af5418315c 100644
--- a/src/plugins/platforms/cocoa/qcocoabackingstore.mm
+++ b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
@@ -38,13 +38,13 @@
 ****************************************************************************/
 
 #include "qcocoabackingstore.h"
-#include <QtGui/QPainter>
-#include "qcocoahelpers.h"
+
+#include "qcocoawindow.h"
 
 QT_BEGIN_NAMESPACE
 
 QCocoaBackingStore::QCocoaBackingStore(QWindow *window)
-    : QPlatformBackingStore(window)
+    : QRasterBackingStore(window)
 {
 }
 
@@ -54,69 +54,21 @@ QCocoaBackingStore::~QCocoaBackingStore()
         [cocoaWindow->m_qtView clearBackingStore:this];
 }
 
-QPaintDevice *QCocoaBackingStore::paintDevice()
-{
-    QCocoaWindow *cocoaWindow = static_cast<QCocoaWindow *>(window()->handle());
-    int windowDevicePixelRatio = int(cocoaWindow->devicePixelRatio());
-
-    // Receate the backing store buffer if the effective buffer size has changed,
-    // either due to a window resize or devicePixelRatio change.
-    QSize effectiveBufferSize = m_requestedSize * windowDevicePixelRatio;
-    if (m_qImage.size() != effectiveBufferSize) {
-        QImage::Format format = (window()->format().hasAlpha() || cocoaWindow->m_drawContentBorderGradient)
-                ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32;
-        m_qImage = QImage(effectiveBufferSize, format);
-        m_qImage.setDevicePixelRatio(windowDevicePixelRatio);
-        if (format == QImage::Format_ARGB32_Premultiplied)
-            m_qImage.fill(Qt::transparent);
-    }
-    return &m_qImage;
-}
-
-void QCocoaBackingStore::flush(QWindow *win, const QRegion &region, const QPoint &offset)
+QImage::Format QCocoaBackingStore::format() const
 {
-    if (!m_qImage.isNull()) {
-        if (QCocoaWindow *cocoaWindow = static_cast<QCocoaWindow *>(win->handle()))
-            [cocoaWindow->m_qtView flushBackingStore:this region:region offset:offset];
-    }
-}
+    if (static_cast<QCocoaWindow *>(window()->handle())->m_drawContentBorderGradient)
+        return QImage::Format_ARGB32_Premultiplied;
 
-QImage QCocoaBackingStore::toImage() const
-{
-    return m_qImage;
+    return QRasterBackingStore::format();
 }
 
-void QCocoaBackingStore::resize(const QSize &size, const QRegion &)
+void QCocoaBackingStore::flush(QWindow *window, const QRegion &region, const QPoint &offset)
 {
-    m_requestedSize = size;
-}
+    if (m_image.isNull())
+        return;
 
-bool QCocoaBackingStore::scroll(const QRegion &area, int dx, int dy)
-{
-    extern void qt_scrollRectInImage(QImage &img, const QRect &rect, const QPoint &offset);
-    const qreal devicePixelRatio = m_qImage.devicePixelRatio();
-    QPoint qpoint(dx * devicePixelRatio, dy * devicePixelRatio);
-    for (const QRect &rect : area) {
-        const QRect qrect(rect.topLeft() * devicePixelRatio, rect.size() * devicePixelRatio);
-        qt_scrollRectInImage(m_qImage, qrect, qpoint);
-    }
-    return true;
-}
-
-void QCocoaBackingStore::beginPaint(const QRegion &region)
-{
-    if (m_qImage.hasAlphaChannel()) {
-        QPainter p(&m_qImage);
-        p.setCompositionMode(QPainter::CompositionMode_Source);
-        const QColor blank = Qt::transparent;
-        for (const QRect &rect : region)
-            p.fillRect(rect, blank);
-    }
-}
-
-qreal QCocoaBackingStore::getBackingStoreDevicePixelRatio()
-{
-    return m_qImage.devicePixelRatio();
+    if (QCocoaWindow *cocoaWindow = static_cast<QCocoaWindow *>(window->handle()))
+        [cocoaWindow->m_qtView flushBackingStore:this region:region offset:offset];
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/qcocoacursor.mm b/src/plugins/platforms/cocoa/qcocoacursor.mm
index 0433084436..8e523dfbbf 100644
--- a/src/plugins/platforms/cocoa/qcocoacursor.mm
+++ b/src/plugins/platforms/cocoa/qcocoacursor.mm
@@ -40,6 +40,7 @@
 #include "qcocoacursor.h"
 #include "qcocoawindow.h"
 #include "qcocoahelpers.h"
+#include <QtGui/private/qcoregraphics_p.h>
 
 #include <QtGui/QBitmap>
 
diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
index 13ae0382ab..7d11023b78 100644
--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
@@ -43,6 +43,7 @@
 #ifndef QT_NO_WIDGETS
 #include <QtWidgets/qwidget.h>
 #endif
+#include <QtGui/private/qcoregraphics_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.h b/src/plugins/platforms/cocoa/qcocoahelpers.h
index 9b061bbae8..536a2d2d58 100644
--- a/src/plugins/platforms/cocoa/qcocoahelpers.h
+++ b/src/plugins/platforms/cocoa/qcocoahelpers.h
@@ -69,25 +69,6 @@ void *qt_mac_QStringListToNSMutableArrayVoid(const QStringList &list);
 inline NSMutableArray *qt_mac_QStringListToNSMutableArray(const QStringList &qstrlist)
 { return reinterpret_cast<NSMutableArray *>(qt_mac_QStringListToNSMutableArrayVoid(qstrlist)); }
 
-NSImage *qt_mac_cgimage_to_nsimage(CGImageRef iamge);
-NSImage *qt_mac_create_nsimage(const QPixmap &pm);
-NSImage *qt_mac_create_nsimage(const QIcon &icon);
-CGImageRef qt_mac_toCGImage(const QImage &qImage);
-CGImageRef qt_mac_toCGImageMask(const QImage &qImage);
-QImage qt_mac_toQImage(CGImageRef image);
-QPixmap qt_mac_toQPixmap(const NSImage *image, const QSizeF &size);
-
-QColor qt_mac_toQColor(const NSColor *color);
-QColor qt_mac_toQColor(CGColorRef color);
-
-QBrush qt_mac_toQBrush(CGColorRef color);
-QBrush qt_mac_toQBrush(const NSColor *color, QPalette::ColorGroup colorGroup = QPalette::Normal);
-
-// Creates a mutable shape, it's the caller's responsibility to release.
-HIMutableShapeRef qt_mac_QRegionToHIMutableShape(const QRegion &region);
-
-OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage);
-
 NSDragOperation qt_mac_mapDropAction(Qt::DropAction action);
 NSDragOperation qt_mac_mapDropActions(Qt::DropActions actions);
 Qt::DropAction qt_mac_mapNSDragOperation(NSDragOperation nsActions);
@@ -95,9 +76,6 @@ Qt::DropActions qt_mac_mapNSDragOperations(NSDragOperation nsActions);
 
 // Misc
 void qt_mac_transformProccessToForegroundApplication();
-CGColorSpaceRef qt_mac_genericColorSpace();
-CGColorSpaceRef qt_mac_displayColorSpace(const QWidget *widget);
-CGColorSpaceRef qt_mac_colorSpaceForDeviceType(const QPaintDevice *paintDevice);
 QString qt_mac_applicationName();
 
 int qt_mac_flipYCoordinate(int y);
@@ -143,8 +121,6 @@ public:
     }
 };
 
-CGContextRef qt_mac_cg_context(QPaintDevice *pdev);
-
 template<typename T>
 T qt_mac_resolveOption(const T &fallback, const QByteArray &environment)
 {
diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
index 542c046d42..0c7c30579e 100644
--- a/src/plugins/platforms/cocoa/qcocoahelpers.mm
+++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm
@@ -47,6 +47,7 @@
 #include <qpa/qplatformscreen.h>
 #include <private/qguiapplication_p.h>
 #include <private/qwindow_p.h>
+#include <QtGui/private/qcoregraphics_p.h>
 
 #ifndef QT_NO_WIDGETS
 #include <QtWidgets/QWidget>
@@ -56,25 +57,6 @@
 
 #include <Carbon/Carbon.h>
 
-@interface NSGraphicsContext (QtAdditions)
-
-+ (NSGraphicsContext *)qt_graphicsContextWithCGContext:(CGContextRef)graphicsPort flipped:(BOOL)initialFlippedState;
-
-@end
-
-@implementation NSGraphicsContext (QtAdditions)
-
-+ (NSGraphicsContext *)qt_graphicsContextWithCGContext:(CGContextRef)graphicsPort flipped:(BOOL)initialFlippedState
-{
-#if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_10, __IPHONE_NA)
-    if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::OSXYosemite)
-        return [self graphicsContextWithCGContext:graphicsPort flipped:initialFlippedState];
-#endif
-    return [self graphicsContextWithGraphicsPort:graphicsPort flipped:initialFlippedState];
-}
-
-@end
-
 QT_BEGIN_NAMESPACE
 
 Q_LOGGING_CATEGORY(lcQpaCocoaWindow, "qt.qpa.cocoa.window");
@@ -101,198 +83,6 @@ void *qt_mac_QStringListToNSMutableArrayVoid(const QStringList &list)
     return result;
 }
 
-CGImageRef qt_mac_toCGImage(const QImage &inImage)
-{
-    CGImageRef cgImage = inImage.toCGImage();
-    if (cgImage)
-        return cgImage;
-
-    // Convert image data to a known-good format if the fast conversion fails.
-    return inImage.convertToFormat(QImage::Format_ARGB32_Premultiplied).toCGImage();
-}
-
-CGImageRef qt_mac_toCGImageMask(const QImage &image)
-{
-    static const auto deleter = [](void *image, const void *, size_t) { delete static_cast<QImage *>(image); };
-    QCFType<CGDataProviderRef> dataProvider =
-            CGDataProviderCreateWithData(new QImage(image), image.bits(),
-                                                    image.byteCount(), deleter);
-
-    return CGImageMaskCreate(image.width(), image.height(), 8, image.depth(),
-                              image.bytesPerLine(), dataProvider, NULL, false);
-}
-
-NSImage *qt_mac_cgimage_to_nsimage(CGImageRef image)
-{
-    NSImage *newImage = [[NSImage alloc] initWithCGImage:image size:NSZeroSize];
-    return newImage;
-}
-
-NSImage *qt_mac_create_nsimage(const QPixmap &pm)
-{
-    if (pm.isNull())
-        return 0;
-    QImage image = pm.toImage();
-    CGImageRef cgImage = qt_mac_toCGImage(image);
-    NSImage *nsImage = qt_mac_cgimage_to_nsimage(cgImage);
-    CGImageRelease(cgImage);
-    return nsImage;
-}
-
-NSImage *qt_mac_create_nsimage(const QIcon &icon)
-{
-    if (icon.isNull())
-        return nil;
-
-    NSImage *nsImage = [[NSImage alloc] init];
-    foreach (QSize size, icon.availableSizes()) {
-        QPixmap pm = icon.pixmap(size);
-        QImage image = pm.toImage();
-        CGImageRef cgImage = qt_mac_toCGImage(image);
-        NSBitmapImageRep *imageRep = [[NSBitmapImageRep alloc] initWithCGImage:cgImage];
-        [nsImage addRepresentation:imageRep];
-        [imageRep release];
-        CGImageRelease(cgImage);
-    }
-    return nsImage;
-}
-
-HIMutableShapeRef qt_mac_QRegionToHIMutableShape(const QRegion &region)
-{
-    HIMutableShapeRef shape = HIShapeCreateMutable();
-    for (const QRect &rect : region) {
-        CGRect cgRect = CGRectMake(rect.x(), rect.y(), rect.width(), rect.height());
-        HIShapeUnionWithRect(shape, &cgRect);
-    }
-    return shape;
-}
-
-QColor qt_mac_toQColor(const NSColor *color)
-{
-    QColor qtColor;
-    NSString *colorSpace = [color colorSpaceName];
-    if (colorSpace == NSDeviceCMYKColorSpace) {
-        CGFloat cyan, magenta, yellow, black, alpha;
-        [color getCyan:&cyan magenta:&magenta yellow:&yellow black:&black alpha:&alpha];
-        qtColor.setCmykF(cyan, magenta, yellow, black, alpha);
-    } else {
-        NSColor *tmpColor;
-        tmpColor = [color colorUsingColorSpaceName:NSDeviceRGBColorSpace];
-        CGFloat red, green, blue, alpha;
-        [tmpColor getRed:&red green:&green blue:&blue alpha:&alpha];
-        qtColor.setRgbF(red, green, blue, alpha);
-    }
-    return qtColor;
-}
-
-QColor qt_mac_toQColor(CGColorRef color)
-{
-    QColor qtColor;
-    CGColorSpaceModel model = CGColorSpaceGetModel(CGColorGetColorSpace(color));
-    const CGFloat *components = CGColorGetComponents(color);
-    if (model == kCGColorSpaceModelRGB) {
-        qtColor.setRgbF(components[0], components[1], components[2], components[3]);
-    } else if (model == kCGColorSpaceModelCMYK) {
-        qtColor.setCmykF(components[0], components[1], components[2], components[3]);
-    } else if (model == kCGColorSpaceModelMonochrome) {
-        qtColor.setRgbF(components[0], components[0], components[0], components[1]);
-    } else {
-        // Colorspace we can't deal with.
-        qWarning("Qt: qt_mac_toQColor: cannot convert from colorspace model: %d", model);
-        Q_ASSERT(false);
-    }
-    return qtColor;
-}
-
-QBrush qt_mac_toQBrush(CGColorRef color)
-{
-    QBrush qtBrush;
-    CGColorSpaceModel model = CGColorSpaceGetModel(CGColorGetColorSpace(color));
-    if (model == kCGColorSpaceModelPattern) {
-        // Colorspace we can't deal with; the color is drawn directly using a callback.
-        qWarning("Qt: qt_mac_toQBrush: cannot convert from colorspace model: %d", model);
-        Q_ASSERT(false);
-    } else {
-        qtBrush.setStyle(Qt::SolidPattern);
-        qtBrush.setColor(qt_mac_toQColor(color));
-    }
-    return qtBrush;
-}
-
-static bool qt_mac_isSystemColorOrInstance(const NSColor *color, NSString *colorNameComponent, NSString *className)
-{
-    // We specifically do not want isKindOfClass: here
-    if ([color.className isEqualToString:className]) // NSPatternColorSpace
-        return true;
-    if ([color.catalogNameComponent isEqualToString:@"System"] &&
-        [color.colorNameComponent isEqualToString:colorNameComponent] &&
-        [color.colorSpaceName isEqualToString:NSNamedColorSpace])
-        return true;
-    return false;
-}
-
-QBrush qt_mac_toQBrush(const NSColor *color, QPalette::ColorGroup colorGroup)
-{
-    QBrush qtBrush;
-
-    // QTBUG-49773: This calls NSDrawMenuItemBackground to render a 1 by n gradient; could use HITheme
-    if ([color.className isEqualToString:@"NSMenuItemHighlightColor"]) {
-        qWarning("Qt: qt_mac_toQBrush: cannot convert from NSMenuItemHighlightColor");
-        return qtBrush;
-    }
-
-    // Not a catalog color or a manifestation of System.windowBackgroundColor;
-    // only retrieved from NSWindow.backgroundColor directly
-    if ([color.className isEqualToString:@"NSMetalPatternColor"]) {
-        // NSTexturedBackgroundWindowMask, could theoretically handle this without private API by
-        // creating a window with the appropriate properties and then calling NSWindow.backgroundColor.patternImage,
-        // which returns a texture sized 1 by (window height, including frame), backed by a CGPattern
-        // which follows the window key state... probably need to allow QBrush to store a function pointer
-        // like CGPattern does
-        qWarning("Qt: qt_mac_toQBrush: cannot convert from NSMetalPatternColor");
-        return qtBrush;
-    }
-
-    // No public API to get these colors/stops;
-    // both accurately obtained through runtime object inspection on OS X 10.11
-    // (the NSColor object has NSGradient i-vars for both color groups)
-    if (qt_mac_isSystemColorOrInstance(color, @"_sourceListBackgroundColor", @"NSSourceListBackgroundColor")) {
-        QLinearGradient gradient;
-        if (colorGroup == QPalette::Active) {
-            gradient.setColorAt(0, QColor(233, 237, 242));
-            gradient.setColorAt(0.5, QColor(225, 229, 235));
-            gradient.setColorAt(1, QColor(209, 216, 224));
-        } else {
-            gradient.setColorAt(0, QColor(248, 248, 248));
-            gradient.setColorAt(0.5, QColor(240, 240, 240));
-            gradient.setColorAt(1, QColor(235, 235, 235));
-        }
-        return QBrush(gradient);
-    }
-
-    // A couple colors are special... they are actually instances of NSGradientPatternColor, which
-    // override set/setFill/setStroke to instead initialize an internal color
-    // ([NSColor colorWithCalibratedWhite:0.909804 alpha:1.000000]) while still returning the
-    // ruled lines pattern image (from OS X 10.4) to the user from -[NSColor patternImage]
-    // (and providing no public API to get the underlying color without this insanity)
-    if (qt_mac_isSystemColorOrInstance(color, @"controlColor", @"NSGradientPatternColor") ||
-        qt_mac_isSystemColorOrInstance(color, @"windowBackgroundColor", @"NSGradientPatternColor")) {
-        qtBrush.setStyle(Qt::SolidPattern);
-        qtBrush.setColor(qt_mac_toQColor(color.CGColor));
-        return qtBrush;
-    }
-
-    if (NSColor *patternColor = [color colorUsingColorSpaceName:NSPatternColorSpace]) {
-        NSImage *patternImage = patternColor.patternImage;
-        const QSizeF sz(patternImage.size.width, patternImage.size.height);
-        qtBrush.setTexture(qt_mac_toQPixmap(patternImage, sz)); // QTBUG-49774
-    } else {
-        qtBrush.setStyle(Qt::SolidPattern);
-        qtBrush.setColor(qt_mac_toQColor(color));
-    }
-    return qtBrush;
-}
-
 struct dndenum_mapper
 {
     NSDragOperation mac_code;
@@ -402,97 +192,6 @@ void qt_mac_transformProccessToForegroundApplication()
         [[NSApplication sharedApplication] setActivationPolicy:NSApplicationActivationPolicyRegular];
     }
 }
-static CGColorSpaceRef m_genericColorSpace = 0;
-static QHash<CGDirectDisplayID, CGColorSpaceRef> m_displayColorSpaceHash;
-static bool m_postRoutineRegistered = false;
-
-CGColorSpaceRef qt_mac_genericColorSpace()
-{
-#if 0
-    if (!m_genericColorSpace) {
-        if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_4) {
-            m_genericColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
-        } else
-        {
-            m_genericColorSpace = CGColorSpaceCreateDeviceRGB();
-        }
-        if (!m_postRoutineRegistered) {
-            m_postRoutineRegistered = true;
-            qAddPostRoutine(QCoreGraphicsPaintEngine::cleanUpMacColorSpaces);
-        }
-    }
-    return m_genericColorSpace;
-#else
-    // Just return the main display colorspace for the moment.
-    return qt_mac_displayColorSpace(0);
-#endif
-}
-
-/*
-    Ideally, we should pass the widget in here, and use CGGetDisplaysWithRect() etc.
-    to support multiple displays correctly.
-*/
-CGColorSpaceRef qt_mac_displayColorSpace(const QWidget *widget)
-{
-    CGColorSpaceRef colorSpace;
-
-    CGDirectDisplayID displayID;
-    if (widget == 0) {
-        displayID = CGMainDisplayID();
-    } else {
-        displayID = CGMainDisplayID();
-        /*
-        ### get correct display
-        const QRect &qrect = widget->window()->geometry();
-        CGRect rect = CGRectMake(qrect.x(), qrect.y(), qrect.width(), qrect.height());
-        CGDisplayCount throwAway;
-        CGDisplayErr dErr = CGGetDisplaysWithRect(rect, 1, &displayID, &throwAway);
-        if (dErr != kCGErrorSuccess)
-            return macDisplayColorSpace(0); // fall back on main display
-        */
-    }
-    if ((colorSpace = m_displayColorSpaceHash.value(displayID)))
-        return colorSpace;
-
-    colorSpace = CGDisplayCopyColorSpace(displayID);
-    if (colorSpace == 0)
-        colorSpace = CGColorSpaceCreateDeviceRGB();
-
-    m_displayColorSpaceHash.insert(displayID, colorSpace);
-    if (!m_postRoutineRegistered) {
-        m_postRoutineRegistered = true;
-        void qt_mac_cleanUpMacColorSpaces();
-        qAddPostRoutine(qt_mac_cleanUpMacColorSpaces);
-    }
-    return colorSpace;
-}
-
-void qt_mac_cleanUpMacColorSpaces()
-{
-    if (m_genericColorSpace) {
-        CFRelease(m_genericColorSpace);
-        m_genericColorSpace = 0;
-    }
-    QHash<CGDirectDisplayID, CGColorSpaceRef>::const_iterator it = m_displayColorSpaceHash.constBegin();
-    while (it != m_displayColorSpaceHash.constEnd()) {
-        if (it.value())
-            CFRelease(it.value());
-        ++it;
-    }
-    m_displayColorSpaceHash.clear();
-}
-
-CGColorSpaceRef qt_mac_colorSpaceForDeviceType(const QPaintDevice *paintDevice)
-{
-#ifdef QT_NO_WIDGETS
-    Q_UNUSED(paintDevice)
-    return qt_mac_displayColorSpace(0);
-#else
-    bool isWidget = (paintDevice->devType() == QInternal::Widget);
-    return qt_mac_displayColorSpace(isWidget ? static_cast<const QWidget *>(paintDevice): 0);
-#endif
-
-}
 
 QString qt_mac_applicationName()
 {
@@ -557,28 +256,6 @@ NSRect qt_mac_flipRect(const QRect &rect)
     return NSMakeRect(rect.x(), flippedY, rect.width(), rect.height());
 }
 
-OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage)
-{
-    // Verbatim copy if HIViewDrawCGImage (as shown on Carbon-Dev)
-    OSStatus err = noErr;
-
-    require_action(inContext != NULL, InvalidContext, err = paramErr);
-    require_action(inBounds != NULL, InvalidBounds, err = paramErr);
-    require_action(inImage != NULL, InvalidImage, err = paramErr);
-
-    CGContextSaveGState( inContext );
-    CGContextTranslateCTM (inContext, 0, inBounds->origin.y + CGRectGetMaxY(*inBounds));
-    CGContextScaleCTM(inContext, 1, -1);
-
-    CGContextDrawImage(inContext, *inBounds, inImage);
-
-    CGContextRestoreGState(inContext);
-InvalidImage:
-InvalidBounds:
-InvalidContext:
-        return err;
-}
-
 Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum)
 {
     if (buttonNum == 0)
@@ -599,81 +276,4 @@ QString qt_mac_removeAmpersandEscapes(QString s)
     return QPlatformTheme::removeMnemonics(s).trimmed();
 }
 
-/*! \internal
-
- Returns the CoreGraphics CGContextRef of the paint device. 0 is
- returned if it can't be obtained. It is the caller's responsibility to
- CGContextRelease the context when finished using it.
-
- \warning This function is only available on \macos.
- \warning This function is duplicated in qmacstyle_mac.mm
- */
-CGContextRef qt_mac_cg_context(QPaintDevice *pdev)
-{
-    // In Qt 5, QWidget and QPixmap (and QImage) paint devices are all QImages under the hood.
-    QImage *image = 0;
-    if (pdev->devType() == QInternal::Image) {
-        image = static_cast<QImage *>(pdev);
-    } else if (pdev->devType() == QInternal::Pixmap) {
-
-        const QPixmap *pm = static_cast<const QPixmap*>(pdev);
-        QPlatformPixmap *data = const_cast<QPixmap *>(pm)->data_ptr().data();
-        if (data && data->classId() == QPlatformPixmap::RasterClass) {
-            image = data->buffer();
-        } else {
-            qDebug("qt_mac_cg_context: Unsupported pixmap class");
-        }
-    } else if (pdev->devType() == QInternal::Widget) {
-        // TODO test: image = static_cast<QImage *>(static_cast<const QWidget *>(pdev)->backingStore()->paintDevice());
-        qDebug("qt_mac_cg_context: not implemented: Widget class");
-    }
-
-    if (!image)
-        return 0; // Context type not supported.
-
-    CGColorSpaceRef colorspace = qt_mac_colorSpaceForDeviceType(pdev);
-    uint flags = kCGImageAlphaPremultipliedFirst;
-    flags |= kCGBitmapByteOrder32Host;
-    CGContextRef ret = 0;
-    ret = CGBitmapContextCreate(image->bits(), image->width(), image->height(),
-                                8, image->bytesPerLine(), colorspace, flags);
-    CGContextTranslateCTM(ret, 0, image->height());
-    CGContextScaleCTM(ret, 1, -1);
-    return ret;
-}
-
-QPixmap qt_mac_toQPixmap(const NSImage *image, const QSizeF &size)
-{
-    const NSSize pixmapSize = NSMakeSize(size.width(), size.height());
-    QPixmap pixmap(pixmapSize.width, pixmapSize.height);
-    pixmap.fill(Qt::transparent);
-    [image setSize:pixmapSize];
-    const NSRect iconRect = NSMakeRect(0, 0, pixmapSize.width, pixmapSize.height);
-    QMacCGContext ctx(&pixmap);
-    if (!ctx)
-        return QPixmap();
-    NSGraphicsContext *gc = [NSGraphicsContext qt_graphicsContextWithCGContext:ctx flipped:YES];
-    if (!gc)
-        return QPixmap();
-    [NSGraphicsContext saveGraphicsState];
-    [NSGraphicsContext setCurrentContext:gc];
-    [image drawInRect:iconRect fromRect:iconRect operation:NSCompositeSourceOver fraction:1.0 respectFlipped:YES hints:nil];
-    [NSGraphicsContext restoreGraphicsState];
-    return pixmap;
-}
-
-QImage qt_mac_toQImage(CGImageRef image)
-{
-    const size_t w = CGImageGetWidth(image),
-                 h = CGImageGetHeight(image);
-    QImage ret(w, h, QImage::Format_ARGB32_Premultiplied);
-    ret.fill(Qt::transparent);
-    CGRect rect = CGRectMake(0, 0, w, h);
-    CGContextRef ctx = qt_mac_cg_context(&ret);
-    qt_mac_drawCGImage(ctx, &rect, image);
-    CGContextRelease(ctx);
-    return ret;
-}
-
-
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 1793bd404e..f3f720654e 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -58,6 +58,8 @@
 #include <qpa/qplatforminputcontextfactory_p.h>
 #include <QtCore/qcoreapplication.h>
 
+#include <QtGui/private/qcoregraphics_p.h>
+
 #include <IOKit/graphics/IOGraphicsLib.h>
 
 static void initResources()
@@ -199,8 +201,6 @@ QWindow *QCocoaScreen::topLevelAt(const QPoint &point) const
     return window;
 }
 
-extern CGContextRef qt_mac_cg_context(const QPaintDevice *pdev);
-
 QPixmap QCocoaScreen::grabWindow(WId window, int x, int y, int width, int height) const
 {
     // TODO window should be handled
@@ -251,9 +251,8 @@ QPixmap QCocoaScreen::grabWindow(WId window, int x, int y, int width, int height
         QPixmap pix(w, h);
         pix.fill(Qt::transparent);
         CGRect rect = CGRectMake(0, 0, w, h);
-        CGContextRef ctx = qt_mac_cg_context(&pix);
+        QMacCGContext ctx(&pix);
         qt_mac_drawCGImage(ctx, &rect, image);
-        CGContextRelease(ctx);
 
         QPainter painter(&windowPixmap);
         painter.drawPixmap(0, 0, pix);
diff --git a/src/plugins/platforms/cocoa/qcocoamenuitem.mm b/src/plugins/platforms/cocoa/qcocoamenuitem.mm
index cac166a409..ea094c86ee 100644
--- a/src/plugins/platforms/cocoa/qcocoamenuitem.mm
+++ b/src/plugins/platforms/cocoa/qcocoamenuitem.mm
@@ -48,6 +48,7 @@
 #include "qt_mac_p.h"
 #include "qcocoaapplication.h" // for custom application category
 #include "qcocoamenuloader.h"
+#include <QtGui/private/qcoregraphics_p.h>
 
 #include <QtCore/QDebug>
 
diff --git a/src/plugins/platforms/cocoa/qcocoamimetypes.mm b/src/plugins/platforms/cocoa/qcocoamimetypes.mm
index e7a3aab845..c109eb7bf4 100644
--- a/src/plugins/platforms/cocoa/qcocoamimetypes.mm
+++ b/src/plugins/platforms/cocoa/qcocoamimetypes.mm
@@ -40,6 +40,7 @@
 #include "qcocoamimetypes.h"
 #include <QtPlatformSupport/private/qmacmime_p.h>
 #include "qcocoahelpers.h"
+#include <QtGui/private/qcoregraphics_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
index 8562246817..3ff37a8463 100644
--- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
+++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
@@ -64,6 +64,8 @@
 #include <qpa/qplatformprintersupport.h>
 #endif
 
+#include <QtGui/private/qcoregraphics_p.h>
+
 #include <QtPlatformHeaders/qcocoawindowfunctions.h>
 
 #include <AppKit/AppKit.h>
diff --git a/src/plugins/platforms/cocoa/qcocoasystemsettings.mm b/src/plugins/platforms/cocoa/qcocoasystemsettings.mm
index be5fa61b8b..9ddad7fc7a 100644
--- a/src/plugins/platforms/cocoa/qcocoasystemsettings.mm
+++ b/src/plugins/platforms/cocoa/qcocoasystemsettings.mm
@@ -43,6 +43,7 @@
 
 #include <QtCore/private/qcore_mac_p.h>
 #include <QtGui/qfont.h>
+#include <QtGui/private/qcoregraphics_p.h>
 
 #include <Carbon/Carbon.h>
 
diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
index 0640faeb8a..9a543e893e 100644
--- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
+++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
@@ -86,6 +86,7 @@
 
 #include "qt_mac_p.h"
 #include "qcocoahelpers.h"
+#include <QtGui/private/qcoregraphics_p.h>
 
 #import <AppKit/AppKit.h>
 
diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm
index 95175871a4..d0879ed457 100644
--- a/src/plugins/platforms/cocoa/qcocoatheme.mm
+++ b/src/plugins/platforms/cocoa/qcocoatheme.mm
@@ -56,6 +56,7 @@
 
 #include <QtCore/qfileinfo.h>
 #include <QtGui/private/qguiapplication_p.h>
+#include <QtGui/private/qcoregraphics_p.h>
 #include <QtGui/qpainter.h>
 #include <QtPlatformSupport/private/qcoretextfontdatabase_p.h>
 #include <QtPlatformSupport/private/qabstractfileiconengine_p.h>
@@ -197,7 +198,7 @@ QPixmap qt_mac_convert_iconref(const IconRef icon, int width, int height)
 
     CGRect rect = CGRectMake(0, 0, width, height);
 
-    CGContextRef ctx = qt_mac_cg_context(&ret);
+    QMacCGContext ctx(&ret);
     CGAffineTransform old_xform = CGContextGetCTM(ctx);
     CGContextConcatCTM(ctx, CGAffineTransformInvert(old_xform));
     CGContextConcatCTM(ctx, CGAffineTransformIdentity);
@@ -205,7 +206,6 @@ QPixmap qt_mac_convert_iconref(const IconRef icon, int width, int height)
     ::RGBColor b;
     b.blue = b.green = b.red = 255*255;
     PlotIconRefInContext(ctx, &rect, kAlignNone, kTransformNone, &b, kPlotIconRefNormalFlags, icon);
-    CGContextRelease(ctx);
     return ret;
 }
 
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 7fb695630b..b2fd0580bc 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -52,6 +52,7 @@
 #include <private/qwindow_p.h>
 #include <qpa/qwindowsysteminterface.h>
 #include <qpa/qplatformscreen.h>
+#include <QtGui/private/qcoregraphics_p.h>
 
 #include <AppKit/AppKit.h>
 
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index 70eaea63cb..e5c0bb4771 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -52,6 +52,7 @@
 #include <QtCore/QDebug>
 #include <QtCore/qsysinfo.h>
 #include <private/qguiapplication_p.h>
+#include <private/qcoregraphics_p.h>
 #include "qcocoabackingstore.h"
 #ifndef QT_NO_OPENGL
 #include "qcocoaglcontext.h"
@@ -494,7 +495,7 @@ static bool _q_dontOverrideCtrlLMB = false;
     qCDebug(lcQpaCocoaWindow) << "[QNSView flushBackingStore:]" << m_window << region.rectCount() << region.boundingRect() << offset;
 
     m_backingStore = backingStore;
-    m_backingStoreOffset = offset * m_backingStore->getBackingStoreDevicePixelRatio();
+    m_backingStoreOffset = offset * m_backingStore->paintDevice()->devicePixelRatio();
     for (const QRect &rect : region)
         [self setNeedsDisplayInRect:NSMakeRect(rect.x(), rect.y(), rect.width(), rect.height())];
 }
@@ -576,7 +577,7 @@ static bool _q_dontOverrideCtrlLMB = false;
 
     // The backing store source rect will be larger on retina displays.
     // Scale dirtyRect by the device pixel ratio:
-    const qreal devicePixelRatio = m_backingStore->getBackingStoreDevicePixelRatio();
+    const qreal devicePixelRatio = m_backingStore->paintDevice()->devicePixelRatio();
     CGRect dirtyBackingRect = CGRectMake(dirtyRect.origin.x * devicePixelRatio,
                                          dirtyRect.origin.y * devicePixelRatio,
                                          dirtyRect.size.width * devicePixelRatio,
diff --git a/src/plugins/platforms/cocoa/qpaintengine_mac.mm b/src/plugins/platforms/cocoa/qpaintengine_mac.mm
index 759c4d26a5..7e241e3ae6 100644
--- a/src/plugins/platforms/cocoa/qpaintengine_mac.mm
+++ b/src/plugins/platforms/cocoa/qpaintengine_mac.mm
@@ -63,6 +63,7 @@
 #include <private/qpainter_p.h>
 #include <private/qpainterpath_p.h>
 #include <private/qtextengine_p.h>
+#include <private/qcoregraphics_p.h>
 
 #include "qcocoahelpers.h"
 
@@ -74,84 +75,6 @@ QT_BEGIN_NAMESPACE
   QCoreGraphicsPaintEngine utility functions
  *****************************************************************************/
 
-static void qt_mac_clip_cg(CGContextRef hd, const QRegion &rgn, CGAffineTransform *orig_xform)
-{
-    CGAffineTransform old_xform = CGAffineTransformIdentity;
-    if (orig_xform) { //setup xforms
-        old_xform = CGContextGetCTM(hd);
-        CGContextConcatCTM(hd, CGAffineTransformInvert(old_xform));
-        CGContextConcatCTM(hd, *orig_xform);
-    }
-
-    //do the clipping
-    CGContextBeginPath(hd);
-    if (rgn.isEmpty()) {
-        CGContextAddRect(hd, CGRectMake(0, 0, 0, 0));
-    } else {
-        for (const QRect &r : rgn) {
-            CGRect mac_r = CGRectMake(r.x(), r.y(), r.width(), r.height());
-            CGContextAddRect(hd, mac_r);
-        }
-    }
-    CGContextClip(hd);
-
-    if (orig_xform) {//reset xforms
-        CGContextConcatCTM(hd, CGAffineTransformInvert(CGContextGetCTM(hd)));
-        CGContextConcatCTM(hd, old_xform);
-    }
-}
-
-// Implemented for qt_mac_p.h
-QMacCGContext::QMacCGContext(QPainter *p)
-{
-    QPaintEngine *pe = p->paintEngine();
-#ifndef QT_NO_PRINTER
-    if (pe->type() == QPaintEngine::MacPrinter)
-        pe = static_cast<QMacPrintEngine*>(pe)->paintEngine();
-#endif
-    pe->syncState();
-    context = 0;
-    if (pe->type() == QPaintEngine::CoreGraphics)
-        context = static_cast<QCoreGraphicsPaintEngine*>(pe)->handle();
-
-    int devType = p->device()->devType();
-    if (pe->type() == QPaintEngine::Raster
-            && (devType == QInternal::Widget || devType == QInternal::Pixmap || devType == QInternal::Image)) {
-
-        CGColorSpaceRef colorspace = qt_mac_colorSpaceForDeviceType(pe->paintDevice());
-        uint flags = kCGImageAlphaPremultipliedFirst;
-#ifdef kCGBitmapByteOrder32Host //only needed because CGImage.h added symbols in the minor version
-        flags |= kCGBitmapByteOrder32Host;
-#endif
-        const QImage *image = (const QImage *) pe->paintDevice();
-
-        context = CGBitmapContextCreate((void *) image->bits(), image->width(), image->height(),
-                                        8, image->bytesPerLine(), colorspace, flags);
-
-        CGContextTranslateCTM(context, 0, image->height());
-        CGContextScaleCTM(context, 1, -1);
-
-        if (devType == QInternal::Widget) {
-            QRegion clip = p->paintEngine()->systemClip();
-            QTransform native = p->deviceTransform();
-
-            if (p->hasClipping()) {
-                QRegion r = p->clipRegion();
-                r.translate(native.dx(), native.dy());
-                if (clip.isEmpty())
-                    clip = r;
-                else
-                    clip &= r;
-            }
-            qt_mac_clip_cg(context, clip, 0);
-
-            CGContextTranslateCTM(context, native.dx(), native.dy());
-        }
-    } else {
-        CGContextRetain(context);
-    }
-}
-
 void qt_mac_cgimage_data_free(void *, const void *memoryToFree, size_t)
 {
     free(const_cast<void *>(memoryToFree));
@@ -453,7 +376,7 @@ static void qt_mac_draw_pattern(void *info, CGContextRef c)
             const QColor c0(0, 0, 0, 0), c1(255, 255, 255, 255);
             QPixmap pm(w*QMACPATTERN_MASK_MULTIPLIER, h*QMACPATTERN_MASK_MULTIPLIER);
             pm.fill(c0);
-            CGContextRef pm_ctx = qt_mac_cg_context(&pm);
+            QMacCGContext pm_ctx(&pm);
             CGContextSetFillColorWithColor(c, cgColorForQColor(c1, pat->pdev));
             CGRect rect = CGRectMake(0, 0, w, h);
             for (int x = 0; x < QMACPATTERN_MASK_MULTIPLIER; ++x) {
@@ -543,7 +466,8 @@ QCoreGraphicsPaintEngine::begin(QPaintDevice *pdev)
     d->cosmeticPenSize = 1;
     d->current.clipEnabled = false;
     d->pixelSize = QPoint(1,1);
-    d->hd = qt_mac_cg_context(pdev);
+    QMacCGContext ctx(pdev);
+    d->hd = CGContextRetain(ctx);
     if (d->hd) {
         d->saveGraphicsState();
         d->orig_xform = CGContextGetCTM(d->hd);
diff --git a/src/plugins/platforms/cocoa/qprintengine_mac_p.h b/src/plugins/platforms/cocoa/qprintengine_mac_p.h
index e3cad3fd57..ee98275b63 100644
--- a/src/plugins/platforms/cocoa/qprintengine_mac_p.h
+++ b/src/plugins/platforms/cocoa/qprintengine_mac_p.h
@@ -149,6 +149,9 @@ public:
     PMPageFormat format() const { return static_cast<PMPageFormat>([printInfo PMPageFormat]); }
     PMPrintSession session() const { return static_cast<PMPrintSession>([printInfo PMPrintSession]); }
     PMPrintSettings settings() const { return static_cast<PMPrintSettings>([printInfo PMPrintSettings]); }
+
+    QPaintEngine *aggregateEngine() Q_DECL_OVERRIDE { return paintEngine; }
+    Qt::HANDLE nativeHandle() Q_DECL_OVERRIDE { return q_func()->handle(); }
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/qt_mac_p.h b/src/plugins/platforms/cocoa/qt_mac_p.h
index 902cf5c636..ce17919e8c 100644
--- a/src/plugins/platforms/cocoa/qt_mac_p.h
+++ b/src/plugins/platforms/cocoa/qt_mac_p.h
@@ -90,44 +90,6 @@ public:
     }
 };
 
-class QMacCGContext
-{
-    CGContextRef context;
-public:
-    QMacCGContext(QPainter *p); //qpaintengine_mac.mm
-    inline QMacCGContext() { context = 0; }
-    inline QMacCGContext(QPaintDevice *pdev) {
-        extern CGContextRef qt_mac_cg_context(QPaintDevice *);
-        context = qt_mac_cg_context(pdev);
-    }
-    inline QMacCGContext(CGContextRef cg, bool takeOwnership=false) {
-        context = cg;
-        if(!takeOwnership)
-            CGContextRetain(context);
-    }
-    inline QMacCGContext(const QMacCGContext &copy) : context(0) { *this = copy; }
-    inline ~QMacCGContext() {
-        if(context)
-            CGContextRelease(context);
-    }
-    inline bool isNull() const { return context; }
-    inline operator CGContextRef() { return context; }
-    inline QMacCGContext &operator=(const QMacCGContext &copy) {
-        if(context)
-            CGContextRelease(context);
-        context = copy.context;
-        CGContextRetain(context);
-        return *this;
-    }
-    inline QMacCGContext &operator=(CGContextRef cg) {
-        if(context)
-            CGContextRelease(context);
-        context = cg;
-        CGContextRetain(context); //we do not take ownership
-        return *this;
-    }
-};
-
 class QMacInternalPasteboardMime;
 class QMimeData;
 
diff --git a/src/plugins/platforms/haiku/qhaikuclipboard.cpp b/src/plugins/platforms/haiku/qhaikuclipboard.cpp
index 0194a0415a..774da4432a 100644
--- a/src/plugins/platforms/haiku/qhaikuclipboard.cpp
+++ b/src/plugins/platforms/haiku/qhaikuclipboard.cpp
@@ -91,7 +91,7 @@ QMimeData *QHaikuClipboard::mimeData(QClipboard::Mode mode)
 
             const status_t status = clipboard->FindData(name, B_MIME_TYPE, &data, &dataLen);
             if (dataLen && (status == B_OK)) {
-                const QString format = QString::fromLatin1(name);
+                const QLatin1String format(name);
                 if (format == QLatin1String("text/plain")) {
                     m_systemMimeData->setText(QString::fromLocal8Bit(reinterpret_cast<const char*>(data), dataLen));
                 } else if (format == QLatin1String("text/html")) {
diff --git a/src/plugins/platforms/ios/qiosbackingstore.mm b/src/plugins/platforms/ios/qiosbackingstore.mm
index fb0c9805f9..357a3db3c9 100644
--- a/src/plugins/platforms/ios/qiosbackingstore.mm
+++ b/src/plugins/platforms/ios/qiosbackingstore.mm
@@ -49,6 +49,8 @@
 
 #include <QtDebug>
 
+QT_BEGIN_NAMESPACE
+
 class QIOSPaintDevice : public QOpenGLPaintDevice
 {
 public:
diff --git a/src/plugins/platforms/ios/qioscontext.mm b/src/plugins/platforms/ios/qioscontext.mm
index 50374dc951..2d5286e971 100644
--- a/src/plugins/platforms/ios/qioscontext.mm
+++ b/src/plugins/platforms/ios/qioscontext.mm
@@ -48,6 +48,8 @@
 #import <OpenGLES/ES2/glext.h>
 #import <QuartzCore/CAEAGLLayer.h>
 
+QT_BEGIN_NAMESPACE
+
 Q_LOGGING_CATEGORY(lcQpaGLContext, "qt.qpa.glcontext");
 
 QIOSContext::QIOSContext(QOpenGLContext *context)
@@ -314,3 +316,4 @@ bool QIOSContext::isSharing() const
 
 #include "moc_qioscontext.cpp"
 
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/ios/qiosfiledialog.h b/src/plugins/platforms/ios/qiosfiledialog.h
index 855bab0424..7fe24eaefe 100644
--- a/src/plugins/platforms/ios/qiosfiledialog.h
+++ b/src/plugins/platforms/ios/qiosfiledialog.h
@@ -43,10 +43,10 @@
 #include <QtCore/qeventloop.h>
 #include <qpa/qplatformdialoghelper.h>
 
-QT_BEGIN_NAMESPACE
-
 Q_FORWARD_DECLARE_OBJC_CLASS(UIViewController);
 
+QT_BEGIN_NAMESPACE
+
 class QIOSFileDialog : public QPlatformFileDialogHelper
 {
 public:
diff --git a/src/plugins/platforms/ios/qiosglobal.h b/src/plugins/platforms/ios/qiosglobal.h
index 50bedd7b28..f74e3004cc 100644
--- a/src/plugins/platforms/ios/qiosglobal.h
+++ b/src/plugins/platforms/ios/qiosglobal.h
@@ -74,6 +74,8 @@ QT_END_NAMESPACE
 + (id)currentFirstResponder;
 @end
 
+QT_BEGIN_NAMESPACE
+
 class FirstResponderCandidate : public QScopedValueRollback<UIResponder *>
 {
 public:
@@ -84,4 +86,6 @@ private:
     static UIResponder *s_firstResponderCandidate;
 };
 
+QT_END_NAMESPACE
+
 #endif // QIOSGLOBAL_H
diff --git a/src/plugins/platforms/ios/qiosglobal.mm b/src/plugins/platforms/ios/qiosglobal.mm
index 7ca3c66971..1482ffc7af 100644
--- a/src/plugins/platforms/ios/qiosglobal.mm
+++ b/src/plugins/platforms/ios/qiosglobal.mm
@@ -114,6 +114,8 @@ int infoPlistValue(NSString* key, int defaultValue)
     return value ? [value intValue] : defaultValue;
 }
 
+QT_END_NAMESPACE
+
 // -------------------------------------------------------------------------
 
 @interface QtFirstResponderEvent : UIEvent
@@ -164,6 +166,8 @@ int infoPlistValue(NSString* key, int defaultValue)
 }
 @end
 
+QT_BEGIN_NAMESPACE
+
 FirstResponderCandidate::FirstResponderCandidate(UIResponder *responder)
     : QScopedValueRollback<UIResponder *>(s_firstResponderCandidate, responder)
 {
diff --git a/src/plugins/platforms/ios/qiosinputcontext.h b/src/plugins/platforms/ios/qiosinputcontext.h
index 2b0643f26e..9fdf021d07 100644
--- a/src/plugins/platforms/ios/qiosinputcontext.h
+++ b/src/plugins/platforms/ios/qiosinputcontext.h
@@ -51,13 +51,13 @@ const char kImePlatformDataInputView[] = "inputView";
 const char kImePlatformDataInputAccessoryView[] = "inputAccessoryView";
 const char kImePlatformDataReturnKeyType[] = "returnKeyType";
 
-QT_BEGIN_NAMESPACE
-
 @class QIOSLocaleListener;
 @class QIOSKeyboardListener;
 @class QIOSTextInputResponder;
 @protocol KeyboardState;
 
+QT_BEGIN_NAMESPACE
+
 struct KeyboardState
 {
     KeyboardState() :
diff --git a/src/plugins/platforms/ios/qiosinputcontext.mm b/src/plugins/platforms/ios/qiosinputcontext.mm
index c6cbb9b101..68088540c6 100644
--- a/src/plugins/platforms/ios/qiosinputcontext.mm
+++ b/src/plugins/platforms/ios/qiosinputcontext.mm
@@ -97,14 +97,14 @@ static QUIView *focusView()
 
 @interface QIOSKeyboardListener : UIGestureRecognizer <UIGestureRecognizerDelegate> {
   @private
-    QIOSInputContext *m_context;
+    QT_PREPEND_NAMESPACE(QIOSInputContext) *m_context;
 }
 @property BOOL hasDeferredScrollToCursor;
 @end
 
 @implementation QIOSKeyboardListener
 
-- (id)initWithQIOSInputContext:(QIOSInputContext *)context
+- (id)initWithQIOSInputContext:(QT_PREPEND_NAMESPACE(QIOSInputContext) *)context
 {
     if (self = [super initWithTarget:self action:@selector(gestureStateChanged:)]) {
 
@@ -291,6 +291,8 @@ static QUIView *focusView()
 
 // -------------------------------------------------------------------------
 
+QT_BEGIN_NAMESPACE
+
 Qt::InputMethodQueries ImeState::update(Qt::InputMethodQueries properties)
 {
     if (!properties)
@@ -713,3 +715,5 @@ QLocale QIOSInputContext::locale() const
 {
     return QLocale(QString::fromNSString([[NSLocale currentLocale] objectForKey:NSLocaleIdentifier]));
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/ios/qiosmessagedialog.h b/src/plugins/platforms/ios/qiosmessagedialog.h
index 971c8d8b4d..e67e10a5e1 100644
--- a/src/plugins/platforms/ios/qiosmessagedialog.h
+++ b/src/plugins/platforms/ios/qiosmessagedialog.h
@@ -43,11 +43,11 @@
 #include <QtCore/qeventloop.h>
 #include <qpa/qplatformdialoghelper.h>
 
-QT_BEGIN_NAMESPACE
-
 Q_FORWARD_DECLARE_OBJC_CLASS(UIAlertController);
 Q_FORWARD_DECLARE_OBJC_CLASS(UIAlertAction);
 
+QT_BEGIN_NAMESPACE
+
 class QIOSMessageDialog : public QPlatformMessageDialogHelper
 {
 public:
diff --git a/src/plugins/platforms/ios/qiosplatformaccessibility.mm b/src/plugins/platforms/ios/qiosplatformaccessibility.mm
index bc51850760..aef4216e03 100644
--- a/src/plugins/platforms/ios/qiosplatformaccessibility.mm
+++ b/src/plugins/platforms/ios/qiosplatformaccessibility.mm
@@ -65,7 +65,7 @@ void invalidateCache(QAccessibleInterface *iface)
     // when items get added or removed from the screen
     foreach (QWindow *win, QGuiApplication::topLevelWindows()) {
         if (win && win->handle()) {
-            QIOSWindow *window = static_cast<QIOSWindow*>(win->handle());
+            QT_PREPEND_NAMESPACE(QIOSWindow) *window = static_cast<QT_PREPEND_NAMESPACE(QIOSWindow) *>(win->handle());
             window->clearAccessibleCache();
         }
     }
diff --git a/src/plugins/platforms/ios/qiosscreen.h b/src/plugins/platforms/ios/qiosscreen.h
index cc83e7f3d2..9fcce42825 100644
--- a/src/plugins/platforms/ios/qiosscreen.h
+++ b/src/plugins/platforms/ios/qiosscreen.h
@@ -68,6 +68,8 @@ public:
     Qt::ScreenOrientation orientation() const Q_DECL_OVERRIDE;
     void setOrientationUpdateMask(Qt::ScreenOrientations mask) Q_DECL_OVERRIDE;
 
+    QPixmap grabWindow(WId window, int x, int y, int width, int height) const override;
+
     UIScreen *uiScreen() const;
     UIWindow *uiWindow() const;
 
diff --git a/src/plugins/platforms/ios/qiosscreen.mm b/src/plugins/platforms/ios/qiosscreen.mm
index 7dd2ce7f6e..86bce0d70b 100644
--- a/src/plugins/platforms/ios/qiosscreen.mm
+++ b/src/plugins/platforms/ios/qiosscreen.mm
@@ -48,6 +48,7 @@
 #include <QtCore/qoperatingsystemversion.h>
 
 #include <QtGui/private/qwindow_p.h>
+#include <private/qcoregraphics_p.h>
 
 #include <sys/sysctl.h>
 
@@ -176,6 +177,8 @@ static QIOSScreen* qtPlatformScreenFor(UIScreen *uiScreen)
 
 // -------------------------------------------------------------------------
 
+QT_BEGIN_NAMESPACE
+
 /*!
     Returns the model identifier of the device.
 
@@ -458,6 +461,38 @@ void QIOSScreen::setOrientationUpdateMask(Qt::ScreenOrientations mask)
     }
 }
 
+QPixmap QIOSScreen::grabWindow(WId window, int x, int y, int width, int height) const
+{
+    if (window && ![reinterpret_cast<id>(window) isKindOfClass:[UIView class]])
+        return QPixmap();
+
+    UIView *view = window ? reinterpret_cast<UIView *>(window) : m_uiWindow;
+
+    if (width < 0)
+        width = qMax(view.bounds.size.width - x, CGFloat(0));
+    if (height < 0)
+        height = qMax(view.bounds.size.height - y, CGFloat(0));
+
+    CGRect captureRect = [m_uiWindow convertRect:CGRectMake(x, y, width, height) fromView:view];
+    captureRect = CGRectIntersection(captureRect, m_uiWindow.bounds);
+
+    UIGraphicsBeginImageContextWithOptions(captureRect.size, NO, 0.0);
+    CGContextRef context = UIGraphicsGetCurrentContext();
+    CGContextTranslateCTM(context, -captureRect.origin.x, -captureRect.origin.y);
+
+    // Draws the complete view hierarchy of m_uiWindow into the given rect, which
+    // needs to be the same aspect ratio as the m_uiWindow's size. Since we've
+    // translated the graphics context, and are potentially drawing into a smaller
+    // context than the full window, the resulting image will be a subsection of the
+    // full screen.
+    [m_uiWindow drawViewHierarchyInRect:m_uiWindow.bounds afterScreenUpdates:NO];
+
+    UIImage *screenshot = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+
+    return QPixmap::fromImage(qt_mac_toQImage(screenshot.CGImage));
+}
+
 UIScreen *QIOSScreen::uiScreen() const
 {
     return m_uiScreen;
diff --git a/src/plugins/platforms/ios/qiostextresponder.h b/src/plugins/platforms/ios/qiostextresponder.h
index f7450df4c8..77be2cf2fe 100644
--- a/src/plugins/platforms/ios/qiostextresponder.h
+++ b/src/plugins/platforms/ios/qiostextresponder.h
@@ -42,19 +42,23 @@
 #include <QtCore/qstring.h>
 #include <QtGui/qevent.h>
 
+QT_BEGIN_NAMESPACE
+
 class QIOSInputContext;
 
+QT_END_NAMESPACE
+
 @interface QIOSTextInputResponder : UIResponder <UITextInputTraits, UIKeyInput, UITextInput>
 {
   @private
-    QIOSInputContext *m_inputContext;
-    QInputMethodQueryEvent *m_configuredImeState;
+    QT_PREPEND_NAMESPACE(QIOSInputContext) *m_inputContext;
+    QT_PREPEND_NAMESPACE(QInputMethodQueryEvent) *m_configuredImeState;
     QString m_markedText;
     BOOL m_inSendEventToFocusObject;
     BOOL m_inSelectionChange;
 }
 
-- (id)initWithInputContext:(QIOSInputContext *)context;
+- (id)initWithInputContext:(QT_PREPEND_NAMESPACE(QIOSInputContext) *)context;
 - (BOOL)needsKeyboardReconfigure:(Qt::InputMethodQueries)updatedProperties;
 
 - (void)notifyInputDelegate:(Qt::InputMethodQueries)updatedProperties;
diff --git a/src/plugins/platforms/ios/qiostextresponder.mm b/src/plugins/platforms/ios/qiostextresponder.mm
index cd7945641e..3c95083e45 100644
--- a/src/plugins/platforms/ios/qiostextresponder.mm
+++ b/src/plugins/platforms/ios/qiostextresponder.mm
@@ -163,7 +163,7 @@
 
 @implementation QIOSTextInputResponder
 
-- (id)initWithInputContext:(QIOSInputContext *)inputContext
+- (id)initWithInputContext:(QT_PREPEND_NAMESPACE(QIOSInputContext) *)inputContext
 {
     if (!(self = [self init]))
         return self;
diff --git a/src/plugins/platforms/ios/qiosviewcontroller.h b/src/plugins/platforms/ios/qiosviewcontroller.h
index 92c4e59d1a..f7b190ba22 100644
--- a/src/plugins/platforms/ios/qiosviewcontroller.h
+++ b/src/plugins/platforms/ios/qiosviewcontroller.h
@@ -38,12 +38,17 @@
 ****************************************************************************/
 
 #import <UIKit/UIKit.h>
+#include <QtCore/QtGlobal>
+
+QT_BEGIN_NAMESPACE
 
 class QIOSScreen;
 
+QT_END_NAMESPACE
+
 @interface QIOSViewController : UIViewController
 
-- (id)initWithQIOSScreen:(QIOSScreen *)screen;
+- (id)initWithQIOSScreen:(QT_PREPEND_NAMESPACE(QIOSScreen) *)screen;
 - (void)updateProperties;
 
 #ifndef Q_OS_TVOS
diff --git a/src/plugins/platforms/ios/qiosviewcontroller.mm b/src/plugins/platforms/ios/qiosviewcontroller.mm
index c8c07bd298..72eb5e27a0 100644
--- a/src/plugins/platforms/ios/qiosviewcontroller.mm
+++ b/src/plugins/platforms/ios/qiosviewcontroller.mm
@@ -58,7 +58,7 @@
 
 @interface QIOSViewController () {
   @public
-    QPointer<QIOSScreen> m_screen;
+    QPointer<QT_PREPEND_NAMESPACE(QIOSScreen)> m_screen;
     BOOL m_updatingProperties;
     QMetaObject::Connection m_focusWindowChangeConnection;
 }
@@ -126,7 +126,7 @@
 {
     Q_UNUSED(subview);
 
-    QIOSScreen *screen = self.qtViewController->m_screen;
+    QT_PREPEND_NAMESPACE(QIOSScreen) *screen = self.qtViewController->m_screen;
 
     // The 'window' property of our view is not valid until the window
     // has been shown, so we have to access it through the QIOSScreen.
@@ -229,7 +229,7 @@
 
 @implementation QIOSViewController
 
-- (id)initWithQIOSScreen:(QIOSScreen *)screen
+- (id)initWithQIOSScreen:(QT_PREPEND_NAMESPACE(QIOSScreen) *)screen
 {
     if (self = [self init]) {
         m_screen = screen;
diff --git a/src/plugins/platforms/ios/qioswindow.h b/src/plugins/platforms/ios/qioswindow.h
index afc2f0f89d..81fad420f6 100644
--- a/src/plugins/platforms/ios/qioswindow.h
+++ b/src/plugins/platforms/ios/qioswindow.h
@@ -48,10 +48,10 @@
 class QIOSContext;
 class QIOSWindow;
 
-QT_BEGIN_NAMESPACE
-
 @class QUIView;
 
+QT_BEGIN_NAMESPACE
+
 class QIOSWindow : public QObject, public QPlatformWindow
 {
     Q_OBJECT
diff --git a/src/plugins/platforms/ios/qioswindow.mm b/src/plugins/platforms/ios/qioswindow.mm
index cddfbe6b06..ae14d87a30 100644
--- a/src/plugins/platforms/ios/qioswindow.mm
+++ b/src/plugins/platforms/ios/qioswindow.mm
@@ -54,6 +54,8 @@
 
 #include <QtDebug>
 
+QT_BEGIN_NAMESPACE
+
 QIOSWindow::QIOSWindow(QWindow *window)
     : QPlatformWindow(window)
     , m_view([[QUIView alloc] initWithQIOSWindow:this])
diff --git a/src/plugins/platforms/ios/quiaccessibilityelement.mm b/src/plugins/platforms/ios/quiaccessibilityelement.mm
index 105d7cd65f..a26ba61b3c 100644
--- a/src/plugins/platforms/ios/quiaccessibilityelement.mm
+++ b/src/plugins/platforms/ios/quiaccessibilityelement.mm
@@ -63,7 +63,7 @@
 
     QAccessibleCache *cache = QAccessibleCache::instance();
 
-    QMacAccessibilityElement *element = cache->elementForId(anId);
+    QT_MANGLE_NAMESPACE(QMacAccessibilityElement) *element = cache->elementForId(anId);
     if (!element) {
         Q_ASSERT(QAccessible::accessibleInterface(anId));
         element = [[self alloc] initWithId:anId withAccessibilityContainer: view];
diff --git a/src/plugins/platforms/ios/quiview.h b/src/plugins/platforms/ios/quiview.h
index fdaae943d8..1500f0b41c 100644
--- a/src/plugins/platforms/ios/quiview.h
+++ b/src/plugins/platforms/ios/quiview.h
@@ -44,14 +44,18 @@
 
 #include <qpa/qwindowsysteminterface.h>
 
+QT_BEGIN_NAMESPACE
+
 class QIOSWindow;
 
+QT_END_NAMESPACE
+
 @class QIOSViewController;
 
 @interface QUIView : UIView
 {
   @public
-    QIOSWindow *m_qioswindow;
+    QT_PREPEND_NAMESPACE(QIOSWindow) *m_qioswindow;
   @private
     QHash<UITouch *, QWindowSystemInterface::TouchPoint> m_activeTouches;
     int m_nextTouchId;
@@ -60,7 +64,7 @@ class QIOSWindow;
     NSMutableArray *m_accessibleElements;
 };
 
-- (id)initWithQIOSWindow:(QIOSWindow *)window;
+- (id)initWithQIOSWindow:(QT_PREPEND_NAMESPACE(QIOSWindow) *)window;
 - (void)sendUpdatedExposeEvent;
 - (BOOL)isActiveWindow;
 @end
diff --git a/src/plugins/platforms/ios/quiview.mm b/src/plugins/platforms/ios/quiview.mm
index 908c8b87f1..133269a0de 100644
--- a/src/plugins/platforms/ios/quiview.mm
+++ b/src/plugins/platforms/ios/quiview.mm
@@ -60,7 +60,7 @@
     return [CAEAGLLayer class];
 }
 
-- (id)initWithQIOSWindow:(QIOSWindow *)window
+- (id)initWithQIOSWindow:(QT_PREPEND_NAMESPACE(QIOSWindow) *)window
 {
     if (self = [self initWithFrame:window->geometry().toCGRect()])
         m_qioswindow = window;
@@ -525,7 +525,7 @@
 - (QWindow *)qwindow
 {
     if ([self isKindOfClass:[QUIView class]]) {
-        if (QIOSWindow *w = static_cast<QUIView *>(self)->m_qioswindow)
+        if (QT_PREPEND_NAMESPACE(QIOSWindow) *w = static_cast<QUIView *>(self)->m_qioswindow)
             return w->window();
     }
     return nil;
diff --git a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp
index 39a4eb81ca..ec73a4c065 100644
--- a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp
@@ -46,6 +46,7 @@
 #include <QtCore/QSettings>
 #include <QtCore/QtEndian>
 #include <QtCore/QVarLengthArray>
+#include <QtCore/QFile>
 #include <private/qstringiterator_p.h>
 #include <QtCore/private/qsystemlibrary_p.h>
 
@@ -236,6 +237,82 @@ QWindowsFontEngineDirectWrite::~QWindowsFontEngineDirectWrite()
         m_directWriteBitmapRenderTarget->Release();
 }
 
+#ifndef Q_CC_MINGW
+typedef IDWriteLocalFontFileLoader QIdWriteLocalFontFileLoader;
+
+static UUID uuidIdWriteLocalFontFileLoader()
+{
+    return __uuidof(IDWriteLocalFontFileLoader);
+}
+#else // !Q_CC_MINGW
+DECLARE_INTERFACE_(QIdWriteLocalFontFileLoader, IDWriteFontFileLoader)
+{
+    STDMETHOD(GetFilePathLengthFromKey)(THIS_ void const *, UINT32, UINT32*) PURE;
+    STDMETHOD(GetFilePathFromKey)(THIS_ void const *, UINT32, WCHAR *, UINT32) PURE;
+    STDMETHOD(GetLastWriteTimeFromKey)(THIS_ void const *, UINT32, FILETIME *) PURE;
+};
+
+static UUID uuidIdWriteLocalFontFileLoader()
+{
+    static const UUID result = { 0xb2d9f3ec, 0xc9fe, 0x4a11, {0xa2, 0xec, 0xd8, 0x62, 0x8, 0xf7, 0xc0, 0xa2}};
+    return result;
+}
+#endif // Q_CC_MINGW
+
+QString QWindowsFontEngineDirectWrite::filenameFromFontFile(IDWriteFontFile *fontFile)
+{
+    IDWriteFontFileLoader *loader = Q_NULLPTR;
+
+    HRESULT hr = fontFile->GetLoader(&loader);
+    if (FAILED(hr)) {
+        qErrnoWarning("%s: GetLoader failed", __FUNCTION__);
+        return QString();
+    }
+
+    QIdWriteLocalFontFileLoader *localLoader = Q_NULLPTR;
+    hr = loader->QueryInterface(uuidIdWriteLocalFontFileLoader(),
+                                reinterpret_cast<void **>(&localLoader));
+
+    const void *fontFileReferenceKey = Q_NULLPTR;
+    UINT32 fontFileReferenceKeySize = 0;
+    if (SUCCEEDED(hr)) {
+        hr = fontFile->GetReferenceKey(&fontFileReferenceKey,
+                                       &fontFileReferenceKeySize);
+        if (FAILED(hr))
+            qErrnoWarning(hr, "%s: GetReferenceKey failed", __FUNCTION__);
+    }
+
+    UINT32 filePathLength = 0;
+    if (SUCCEEDED(hr)) {
+        hr = localLoader->GetFilePathLengthFromKey(fontFileReferenceKey,
+                                                   fontFileReferenceKeySize,
+                                                   &filePathLength);
+        if (FAILED(hr))
+            qErrnoWarning(hr, "GetFilePathLength failed", __FUNCTION__);
+    }
+
+    QString ret;
+    if (SUCCEEDED(hr) && filePathLength > 0) {
+        QVarLengthArray<wchar_t> filePath(filePathLength + 1);
+
+        hr = localLoader->GetFilePathFromKey(fontFileReferenceKey,
+                                             fontFileReferenceKeySize,
+                                             filePath.data(),
+                                             filePathLength + 1);
+        if (FAILED(hr))
+            qErrnoWarning(hr, "%s: GetFilePathFromKey failed", __FUNCTION__);
+        else
+            ret = QString::fromWCharArray(filePath.data());
+    }
+
+    if (localLoader != Q_NULLPTR)
+        localLoader->Release();
+
+    if (loader != Q_NULLPTR)
+        loader->Release();
+    return ret;
+}
+
 void QWindowsFontEngineDirectWrite::collectMetrics()
 {
     DWRITE_FONT_METRICS metrics;
@@ -250,6 +327,13 @@ void QWindowsFontEngineDirectWrite::collectMetrics()
     m_xHeight = DESIGN_TO_LOGICAL(metrics.xHeight);
     m_lineGap = DESIGN_TO_LOGICAL(metrics.lineGap);
     m_underlinePosition = DESIGN_TO_LOGICAL(metrics.underlinePosition);
+
+    IDWriteFontFile *fontFile = Q_NULLPTR;
+    UINT32 numberOfFiles = 1;
+    if (SUCCEEDED(m_directWriteFontFace->GetFiles(&numberOfFiles, &fontFile))) {
+        m_faceId.filename = QFile::encodeName(filenameFromFontFile(fontFile));
+        fontFile->Release();
+    }
 }
 
 QFixed QWindowsFontEngineDirectWrite::underlinePosition() const
@@ -351,6 +435,11 @@ bool QWindowsFontEngineDirectWrite::stringToCMap(const QChar *str, int len, QGly
     return true;
 }
 
+QFontEngine::FaceId QWindowsFontEngineDirectWrite::faceId() const
+{
+    return m_faceId;
+}
+
 void QWindowsFontEngineDirectWrite::recalcAdvances(QGlyphLayout *glyphs, QFontEngine::ShaperFlags) const
 {
     QVarLengthArray<UINT16> glyphIndices(glyphs->numGlyphs);
diff --git a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h
index fb2df00b7e..1978304b13 100644
--- a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h
+++ b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h
@@ -49,6 +49,7 @@
 
 struct IDWriteFont;
 struct IDWriteFontFace;
+struct IDWriteFontFile;
 struct IDWriteFactory;
 struct IDWriteBitmapRenderTarget;
 struct IDWriteGdiInterop;
@@ -92,6 +93,7 @@ public:
     QFixed leading() const Q_DECL_OVERRIDE;
     QFixed xHeight() const Q_DECL_OVERRIDE;
     qreal maxCharWidth() const Q_DECL_OVERRIDE;
+    FaceId faceId() const Q_DECL_OVERRIDE;
 
     bool supportsSubPixelPositions() const Q_DECL_OVERRIDE;
 
@@ -113,6 +115,7 @@ private:
     QImage imageForGlyph(glyph_t t, QFixed subPixelPosition, int margin, const QTransform &xform);
     void collectMetrics();
     void renderGlyphRun(QImage *destination, float r, float g, float b, float a, IDWriteGlyphRunAnalysis *glyphAnalysis, const QRect &boundingRect);
+    static QString filenameFromFontFile(IDWriteFontFile *fontFile);
 
     const QSharedPointer<QWindowsFontEngineData> m_fontEngineData;
 
diff --git a/src/plugins/platforms/winrt/qwinrtinputcontext.cpp b/src/plugins/platforms/winrt/qwinrtinputcontext.cpp
index 968c47f2c2..63e5b0cf27 100644
--- a/src/plugins/platforms/winrt/qwinrtinputcontext.cpp
+++ b/src/plugins/platforms/winrt/qwinrtinputcontext.cpp
@@ -86,30 +86,31 @@ QWinRTInputContext::QWinRTInputContext(QWinRTScreen *screen)
 {
     qCDebug(lcQpaInputMethods) << __FUNCTION__ << screen;
 
-    ComPtr<IInputPaneStatics> statics;
-    if (FAILED(GetActivationFactory(HString::MakeReference(RuntimeClass_Windows_UI_ViewManagement_InputPane).Get(),
-                                    &statics))) {
-        qWarning("failed to retrieve input pane statics.");
-        return;
-    }
+    QEventDispatcherWinRT::runOnXamlThread([this]() {
+        ComPtr<IInputPaneStatics> statics;
+        if (FAILED(GetActivationFactory(HString::MakeReference(RuntimeClass_Windows_UI_ViewManagement_InputPane).Get(),
+                                        &statics))) {
+            qWarning("failed to retrieve input pane statics.");
+            return S_OK;
+        }
 
-    ComPtr<IInputPane> inputPane;
-    statics->GetForCurrentView(&inputPane);
-    if (inputPane) {
-        QEventDispatcherWinRT::runOnXamlThread([this, inputPane]() {
+        ComPtr<IInputPane> inputPane;
+        statics->GetForCurrentView(&inputPane);
+        if (inputPane) {
             EventRegistrationToken showToken, hideToken;
             inputPane->add_Showing(Callback<InputPaneVisibilityHandler>(
                 this, &QWinRTInputContext::onShowing).Get(), &showToken);
             inputPane->add_Hiding(Callback<InputPaneVisibilityHandler>(
                 this, &QWinRTInputContext::onHiding).Get(), &hideToken);
-            return S_OK;
-        });
 
-        m_keyboardRect = getInputPaneRect(inputPane, m_screen->scaleFactor());
-        m_isInputPanelVisible = !m_keyboardRect.isEmpty();
-    } else {
-        qWarning("failed to retrieve InputPane.");
-    }
+            m_keyboardRect = getInputPaneRect(inputPane, m_screen->scaleFactor());
+            m_isInputPanelVisible = !m_keyboardRect.isEmpty();
+        } else {
+            qWarning("failed to retrieve InputPane.");
+        }
+        return S_OK;
+    });
+
     connect(QGuiApplication::inputMethod(), &QInputMethod::cursorRectangleChanged,
             this, &QWinRTInputContext::updateScreenCursorRect);
 }
diff --git a/src/plugins/platforms/xcb/qxcbmime.cpp b/src/plugins/platforms/xcb/qxcbmime.cpp
index 749906d1e8..f71c5464d0 100644
--- a/src/plugins/platforms/xcb/qxcbmime.cpp
+++ b/src/plugins/platforms/xcb/qxcbmime.cpp
@@ -173,7 +173,7 @@ QVariant QXcbMime::mimeConvertToFormat(QXcbConnection *connection, xcb_atom_t a,
 //    qDebug() << "mimeConvertDataToFormat" << format << atomName << data;
 
     if (!encoding.isEmpty()
-        && atomName == format + QLatin1String(";charset=") + QString::fromLatin1(encoding)) {
+        && atomName == format + QLatin1String(";charset=") + QLatin1String(encoding)) {
 
 #ifndef QT_NO_TEXTCODEC
         if (requestedType == QVariant::String) {