12 files changed, 139 insertions, 615 deletions

diff --git a/src/plugins/platforms/winrt/qwinrteglcontext.cpp b/src/plugins/platforms/winrt/qwinrteglcontext.cpp
index 5c3ecd8726..8a250c516a 100644
--- a/src/plugins/platforms/winrt/qwinrteglcontext.cpp
+++ b/src/plugins/platforms/winrt/qwinrteglcontext.cpp
@@ -51,8 +51,8 @@
 
 #include <QOffscreenSurface>
 #include <QOpenGLContext>
-#include <QtPlatformSupport/private/qeglconvenience_p.h>
-#include <QtPlatformSupport/private/qeglpbuffer_p.h>
+#include <QtEglSupport/private/qeglconvenience_p.h>
+#include <QtEglSupport/private/qeglpbuffer_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/winrt/qwinrtfontdatabase.cpp b/src/plugins/platforms/winrt/qwinrtfontdatabase.cpp
deleted file mode 100644
index d4f2ba1bd6..0000000000
--- a/src/plugins/platforms/winrt/qwinrtfontdatabase.cpp
+++ /dev/null
@@ -1,491 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qwinrtfontdatabase.h"
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
-
-#include <QtCore/QUuid>
-#include <QtGui/private/qfontengine_ft_p.h>
-#include <dwrite_1.h>
-#include <wrl.h>
-using namespace Microsoft::WRL;
-
-QT_BEGIN_NAMESPACE
-
-Q_LOGGING_CATEGORY(lcQpaFonts, "qt.qpa.fonts")
-
-QDebug operator<<(QDebug d, const QFontDef &def)
-{
-    QDebugStateSaver saver(d);
-    d.nospace();
-    d << "Family=" << def.family << " Stylename=" << def.styleName
-        << " pointsize=" << def.pointSize << " pixelsize=" << def.pixelSize
-        << " styleHint=" << def.styleHint << " weight=" << def.weight
-        << " stretch=" << def.stretch << " hintingPreference="
-        << def.hintingPreference;
-    return d;
-}
-
-// Based on unicode range tables at http://www.microsoft.com/typography/otspec/os2.htm#ur
-static QFontDatabase::WritingSystem writingSystemFromUnicodeRange(const DWRITE_UNICODE_RANGE &range)
-{
-    if (range.first >= 0x0000 && range.last <= 0x007F)
-        return QFontDatabase::Latin;
-    if (range.first >= 0x0370 && range.last <= 0x03FF)
-        return QFontDatabase::Greek;
-    if (range.first >= 0x0400 && range.last <= 0x04FF)
-        return QFontDatabase::Cyrillic;
-    if (range.first >= 0x0530 && range.last <= 0x058F)
-        return QFontDatabase::Armenian;
-    if (range.first >= 0x0590 && range.last <= 0x05FF)
-        return QFontDatabase::Hebrew;
-    if (range.first >= 0x0600 && range.last <= 0x06FF)
-        return QFontDatabase::Arabic;
-    if (range.first >= 0x0700 && range.last <= 0x074F)
-        return QFontDatabase::Syriac;
-    if (range.first >= 0x0780 && range.last <= 0x07BF)
-        return QFontDatabase::Thaana;
-    if (range.first >= 0x0900 && range.last <= 0x097F)
-        return QFontDatabase::Devanagari;
-    if (range.first >= 0x0980 && range.last <= 0x09FF)
-        return QFontDatabase::Bengali;
-    if (range.first >= 0x0A00 && range.last <= 0x0A7F)
-        return QFontDatabase::Gurmukhi;
-    if (range.first >= 0x0A80 && range.last <= 0x0AFF)
-        return QFontDatabase::Gujarati;
-    if (range.first >= 0x0B00 && range.last <= 0x0B7F)
-        return QFontDatabase::Oriya;
-    if (range.first >= 0x0B80 && range.last <= 0x0BFF)
-        return QFontDatabase::Tamil;
-    if (range.first >= 0x0C00 && range.last <= 0x0C7F)
-        return QFontDatabase::Telugu;
-    if (range.first >= 0x0C80 && range.last <= 0x0CFF)
-        return QFontDatabase::Kannada;
-    if (range.first >= 0x0D00 && range.last <= 0x0D7F)
-        return QFontDatabase::Malayalam;
-    if (range.first >= 0x0D80 && range.last <= 0x0DFF)
-        return QFontDatabase::Sinhala;
-    if (range.first >= 0x0E00 && range.last <= 0x0E7F)
-        return QFontDatabase::Thai;
-    if (range.first >= 0x0E80 && range.last <= 0x0EFF)
-        return QFontDatabase::Lao;
-    if (range.first >= 0x0F00 && range.last <= 0x0FFF)
-        return QFontDatabase::Tibetan;
-    if (range.first >= 0x1000 && range.last <= 0x109F)
-        return QFontDatabase::Myanmar;
-    if (range.first >= 0x10A0 && range.last <= 0x10FF)
-        return QFontDatabase::Georgian;
-    if (range.first >= 0x1780 && range.last <= 0x17FF)
-        return QFontDatabase::Khmer;
-    if (range.first >= 0x4E00 && range.last <= 0x9FFF)
-        return QFontDatabase::SimplifiedChinese;
-    if (range.first >= 0xAC00 && range.last <= 0xD7AF)
-        return QFontDatabase::Korean;
-    if (range.first >= 0x1680 && range.last <= 0x169F)
-        return QFontDatabase::Ogham;
-    if (range.first >= 0x16A0 && range.last <= 0x16FF)
-        return QFontDatabase::Runic;
-    if (range.first >= 0x07C0 && range.last <= 0x07FF)
-        return QFontDatabase::Nko;
-
-    return QFontDatabase::Other;
-}
-
-QString QWinRTFontDatabase::fontDir() const
-{
-    qCDebug(lcQpaFonts) << __FUNCTION__;
-    QString fontDirectory = QBasicFontDatabase::fontDir();
-    if (!QFile::exists(fontDirectory)) {
-        // Fall back to app directory + fonts, and just app directory after that
-        const QString applicationDirPath = QCoreApplication::applicationDirPath();
-        fontDirectory = applicationDirPath + QLatin1String("/fonts");
-        if (!QFile::exists(fontDirectory)) {
-            if (m_fontFamilies.isEmpty())
-                qWarning("No fonts directory found in application package.");
-            fontDirectory = applicationDirPath;
-        }
-    }
-    return fontDirectory;
-}
-
-QWinRTFontDatabase::~QWinRTFontDatabase()
-{
-    qCDebug(lcQpaFonts) << __FUNCTION__;
-
-    foreach (IDWriteFontFile *fontFile, m_fonts.keys())
-        fontFile->Release();
-
-    foreach (IDWriteFontFamily *fontFamily, m_fontFamilies)
-        fontFamily->Release();
-}
-
-QFont QWinRTFontDatabase::defaultFont() const
-{
-    return QFont(QStringLiteral("Segoe UI"));
-}
-
-bool QWinRTFontDatabase::fontsAlwaysScalable() const
-{
-    return true;
-}
-
-void QWinRTFontDatabase::populateFontDatabase()
-{
-    qCDebug(lcQpaFonts) << __FUNCTION__;
-
-    ComPtr<IDWriteFactory1> factory;
-    HRESULT hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_ISOLATED, __uuidof(IDWriteFactory1), &factory);
-    if (FAILED(hr)) {
-        qWarning("Failed to create DirectWrite factory: %s", qPrintable(qt_error_string(hr)));
-        QBasicFontDatabase::populateFontDatabase();
-        return;
-    }
-
-    ComPtr<IDWriteFontCollection> fontCollection;
-    hr = factory->GetSystemFontCollection(&fontCollection);
-    if (FAILED(hr)) {
-        qWarning("Failed to open system font collection: %s", qPrintable(qt_error_string(hr)));
-        QBasicFontDatabase::populateFontDatabase();
-        return;
-    }
-
-    int fontFamilyCount = fontCollection->GetFontFamilyCount();
-    for (int i = 0; i < fontFamilyCount; ++i) {
-        ComPtr<IDWriteFontFamily> fontFamily;
-        hr = fontCollection->GetFontFamily(i, &fontFamily);
-        if (FAILED(hr)) {
-            qWarning("Unable to get font family: %s", qPrintable(qt_error_string(hr)));
-            continue;
-        }
-
-        ComPtr<IDWriteLocalizedStrings> names;
-        hr = fontFamily->GetFamilyNames(&names);
-        if (FAILED(hr)) {
-            qWarning("Unable to get font family names: %s", qPrintable(qt_error_string(hr)));
-            continue;
-        }
-        quint32 familyNameLength;
-        hr = names->GetStringLength(0, &familyNameLength);
-        if (FAILED(hr)) {
-            qWarning("Unable to get family name length: %s", qPrintable(qt_error_string(hr)));
-            continue;
-        }
-        QVector<wchar_t> familyBuffer(familyNameLength + 1);
-        hr = names->GetString(0, familyBuffer.data(), familyBuffer.size());
-        if (FAILED(hr)) {
-            qWarning("Unable to create font family name: %s", qPrintable(qt_error_string(hr)));
-            continue;
-        }
-        QString familyName = QString::fromWCharArray(familyBuffer.data(), familyNameLength);
-
-        m_fontFamilies.insert(familyName, fontFamily.Detach());
-
-        registerFontFamily(familyName);
-    }
-
-    QBasicFontDatabase::populateFontDatabase();
-}
-
-void QWinRTFontDatabase::populateFamily(const QString &familyName)
-{
-    qCDebug(lcQpaFonts) << __FUNCTION__ << familyName;
-
-    IDWriteFontFamily *fontFamily = m_fontFamilies.value(familyName);
-    if (!fontFamily) {
-        qWarning("The font family %s was not found.", qPrintable(familyName));
-        return;
-    }
-
-    bool fontRegistered = false;
-    const int fontCount = fontFamily->GetFontCount();
-    for (int j = 0; j < fontCount; ++j) {
-        ComPtr<IDWriteFont> font;
-        HRESULT hr = fontFamily->GetFont(j, &font);
-        if (FAILED(hr)) {
-            qWarning("Unable to get font: %s", qPrintable(qt_error_string(hr)));
-            continue;
-        }
-
-        // Skip simulated faces
-        if (font->GetSimulations() != DWRITE_FONT_SIMULATIONS_NONE)
-            continue;
-
-        ComPtr<IDWriteFontFace> baseFontFace;
-        hr = font->CreateFontFace(&baseFontFace);
-        if (FAILED(hr)) {
-            qWarning("Unable to create base font face: %s", qPrintable(qt_error_string(hr)));
-            continue;
-        }
-        ComPtr<IDWriteFontFace1> fontFace;
-        hr = baseFontFace.As(&fontFace);
-        if (FAILED(hr)) {
-            qWarning("Unable to create font face: %s", qPrintable(qt_error_string(hr)));
-            continue;
-        }
-
-        // We can't deal with multi-file fonts
-        quint32 fileCount;
-        hr = fontFace->GetFiles(&fileCount, NULL);
-        if (FAILED(hr)) {
-            qWarning("Unable to get font file count: %s", qPrintable(qt_error_string(hr)));
-            continue;
-        }
-        if (fileCount != 1)
-            continue;
-
-        ComPtr<IDWriteLocalizedStrings> informationalStrings;
-        BOOL exists;
-        hr = font->GetInformationalStrings(DWRITE_INFORMATIONAL_STRING_MANUFACTURER,
-                                           &informationalStrings, &exists);
-        if (FAILED(hr)) {
-            qWarning("Unable to get font foundry: %s", qPrintable(qt_error_string(hr)));
-            continue;
-        }
-        QString foundryName;
-        if (exists) {
-            quint32 length;
-            hr = informationalStrings->GetStringLength(0, &length);
-            if (FAILED(hr))
-                qWarning("Unable to get foundry name length: %s", qPrintable(qt_error_string(hr)));
-            if (SUCCEEDED(hr)) {
-                QVector<wchar_t> buffer(length + 1);
-                hr = informationalStrings->GetString(0, buffer.data(), buffer.size());
-                if (FAILED(hr))
-                    qWarning("Unable to get foundry name: %s", qPrintable(qt_error_string(hr)));
-                if (SUCCEEDED(hr))
-                    foundryName = QString::fromWCharArray(buffer.data(), length);
-            }
-        }
-
-        QFont::Weight weight = QPlatformFontDatabase::weightFromInteger(font->GetWeight());
-
-        QFont::Style style;
-        switch (font->GetStyle()) {
-        default:
-        case DWRITE_FONT_STYLE_NORMAL:
-            style = QFont::StyleNormal;
-            break;
-        case DWRITE_FONT_STYLE_OBLIQUE:
-            style = QFont::StyleOblique;
-            break;
-        case DWRITE_FONT_STYLE_ITALIC:
-            style = QFont::StyleItalic;
-            break;
-        }
-
-        QFont::Stretch stretch;
-        switch (font->GetStretch()) {
-        default:
-        case DWRITE_FONT_STRETCH_UNDEFINED:
-        case DWRITE_FONT_STRETCH_NORMAL:
-            stretch = QFont::Unstretched;
-            break;
-        case DWRITE_FONT_STRETCH_ULTRA_CONDENSED:
-            stretch = QFont::UltraCondensed;
-            break;
-        case DWRITE_FONT_STRETCH_EXTRA_CONDENSED:
-            stretch = QFont::ExtraCondensed;
-            break;
-        case DWRITE_FONT_STRETCH_CONDENSED:
-            stretch = QFont::Condensed;
-            break;
-        case DWRITE_FONT_STRETCH_SEMI_CONDENSED:
-            stretch = QFont::SemiCondensed;
-            break;
-        case DWRITE_FONT_STRETCH_SEMI_EXPANDED:
-            stretch = QFont::SemiExpanded;
-            break;
-        case DWRITE_FONT_STRETCH_EXPANDED:
-            stretch = QFont::Expanded;
-            break;
-        case DWRITE_FONT_STRETCH_EXTRA_EXPANDED:
-            stretch = QFont::ExtraExpanded;
-            break;
-        case DWRITE_FONT_STRETCH_ULTRA_EXPANDED:
-            stretch = QFont::UltraExpanded;
-            break;
-        }
-
-        const bool fixedPitch = fontFace->IsMonospacedFont();
-
-        // Get writing systems from unicode ranges
-        quint32 actualRangeCount;
-        hr = fontFace->GetUnicodeRanges(0, nullptr, &actualRangeCount);
-        Q_ASSERT(hr == E_NOT_SUFFICIENT_BUFFER);
-        QVector<DWRITE_UNICODE_RANGE> unicodeRanges(actualRangeCount);
-        hr = fontFace->GetUnicodeRanges(actualRangeCount, unicodeRanges.data(), &actualRangeCount);
-        if (FAILED(hr)) {
-            qWarning("Unable to get font unicode range: %s", qPrintable(qt_error_string(hr)));
-            continue;
-        }
-        QSupportedWritingSystems writingSystems;
-        for (quint32 i = 0; i < actualRangeCount; ++i) {
-            const QFontDatabase::WritingSystem writingSystem = writingSystemFromUnicodeRange(unicodeRanges.at(i));
-            writingSystems.setSupported(writingSystem);
-        }
-        if (writingSystems.supported(QFontDatabase::SimplifiedChinese)) {
-            writingSystems.setSupported(QFontDatabase::TraditionalChinese);
-            writingSystems.setSupported(QFontDatabase::Japanese);
-        }
-        if (writingSystems.supported(QFontDatabase::Latin))
-            writingSystems.setSupported(QFontDatabase::Vietnamese);
-
-        IDWriteFontFile *fontFile;
-        hr = fontFace->GetFiles(&fileCount, &fontFile);
-        if (FAILED(hr)) {
-            qWarning("Unable to get font file: %s", qPrintable(qt_error_string(hr)));
-            continue;
-        }
-
-        FontDescription description = { fontFace->GetIndex(), QUuid::createUuid().toByteArray() };
-        m_fonts.insert(fontFile, description);
-        registerFont(familyName, QString(), foundryName, weight, style, stretch,
-                     true, true, 0, fixedPitch, writingSystems, fontFile);
-        fontRegistered = true;
-    }
-
-    // Always populate something to avoid an assert
-    if (!fontRegistered) {
-        registerFont(familyName, QString(), QString(), QFont::Normal, QFont::StyleNormal,
-                     QFont::Unstretched, false, false, 0, false, QSupportedWritingSystems(), 0);
-    }
-}
-
-QFontEngine *QWinRTFontDatabase::fontEngine(const QFontDef &fontDef, void *handle)
-{
-    qCDebug(lcQpaFonts) << __FUNCTION__ << "FONTDEF" << fontDef << handle;
-
-    if (!handle) // Happens if a font family population failed
-        return 0;
-
-    IDWriteFontFile *fontFile = reinterpret_cast<IDWriteFontFile *>(handle);
-    if (!m_fonts.contains(fontFile))
-        return QBasicFontDatabase::fontEngine(fontDef, handle);
-
-    const void *referenceKey;
-    quint32 referenceKeySize;
-    HRESULT hr = fontFile->GetReferenceKey(&referenceKey, &referenceKeySize);
-    if (FAILED(hr)) {
-        qWarning("Unable to get font file reference key: %s", qPrintable(qt_error_string(hr)));
-        return 0;
-    }
-
-    ComPtr<IDWriteFontFileLoader> loader;
-    hr = fontFile->GetLoader(&loader);
-    if (FAILED(hr)) {
-        qWarning("Unable to get font file loader: %s", qPrintable(qt_error_string(hr)));
-        return 0;
-    }
-
-    ComPtr<IDWriteFontFileStream> stream;
-    hr =loader->CreateStreamFromKey(referenceKey, referenceKeySize, &stream);
-    if (FAILED(hr)) {
-        qWarning("Unable to get font file stream: %s", qPrintable(qt_error_string(hr)));
-        return 0;
-    }
-
-    quint64 fileSize;
-    hr = stream->GetFileSize(&fileSize);
-    if (FAILED(hr)) {
-        qWarning("Unable to get font file size: %s", qPrintable(qt_error_string(hr)));
-        return 0;
-    }
-
-    const void *data;
-    void *context;
-    hr = stream->ReadFileFragment(&data, 0, fileSize, &context);
-    if (FAILED(hr)) {
-        qWarning("Unable to get font file data: %s", qPrintable(qt_error_string(hr)));
-        return 0;
-    }
-    const QByteArray fontData((const char *)data, fileSize);
-    stream->ReleaseFileFragment(context);
-
-    QFontEngine::FaceId faceId;
-    const FontDescription description = m_fonts.value(fontFile);
-    faceId.uuid = description.uuid;
-    faceId.index = description.index;
-    const bool antialias = !(fontDef.styleStrategy & QFont::NoAntialias);
-    QFontEngineFT::GlyphFormat format = antialias ? QFontEngineFT::Format_A8 : QFontEngineFT::Format_Mono;
-    QFontEngineFT *engine = new QFontEngineFT(fontDef);
-    if (!engine->init(faceId, antialias, format, fontData) || engine->invalid()) {
-        delete engine;
-        return 0;
-    }
-
-    return engine;
-}
-
-QStringList QWinRTFontDatabase::fallbacksForFamily(const QString &family, QFont::Style style,
-                                                   QFont::StyleHint styleHint,
-                                                   QChar::Script script) const
-{
-    Q_UNUSED(style)
-    Q_UNUSED(styleHint)
-    Q_UNUSED(script)
-
-    qCDebug(lcQpaFonts) << __FUNCTION__ << family;
-
-    QStringList result;
-    if (family == QLatin1String("Helvetica"))
-        result.append(QStringLiteral("Arial"));
-    result.append(QBasicFontDatabase::fallbacksForFamily(family, style, styleHint, script));
-    return result;
-}
-
-void QWinRTFontDatabase::releaseHandle(void *handle)
-{
-    qCDebug(lcQpaFonts) << __FUNCTION__ << handle;
-
-    if (!handle)
-        return;
-
-    IDWriteFontFile *fontFile = reinterpret_cast<IDWriteFontFile *>(handle);
-    if (m_fonts.contains(fontFile)) {
-        m_fonts.remove(fontFile);
-        fontFile->Release();
-        return;
-    }
-
-    QBasicFontDatabase::releaseHandle(handle);
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/platforms/winrt/qwinrtfontdatabase.h b/src/plugins/platforms/winrt/qwinrtfontdatabase.h
deleted file mode 100644
index 8539bcb9db..0000000000
--- a/src/plugins/platforms/winrt/qwinrtfontdatabase.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QWINRTFONTDATABASE_H
-#define QWINRTFONTDATABASE_H
-
-#include <QtPlatformSupport/private/qbasicfontdatabase_p.h>
-#include <QtCore/QLoggingCategory>
-
-struct IDWriteFontFile;
-struct IDWriteFontFamily;
-
-QT_BEGIN_NAMESPACE
-
-Q_DECLARE_LOGGING_CATEGORY(lcQpaFonts)
-
-struct FontDescription
-{
-    quint32 index;
-    QByteArray uuid;
-};
-
-class QWinRTFontDatabase : public QBasicFontDatabase
-{
-public:
-    QString fontDir() const;
-    ~QWinRTFontDatabase();
-    QFont defaultFont() const Q_DECL_OVERRIDE;
-    bool fontsAlwaysScalable() const Q_DECL_OVERRIDE;
-    void populateFontDatabase() Q_DECL_OVERRIDE;
-    void populateFamily(const QString &familyName) Q_DECL_OVERRIDE;
-    QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) Q_DECL_OVERRIDE;
-    QStringList fallbacksForFamily(const QString &family, QFont::Style style,
-                                   QFont::StyleHint styleHint, QChar::Script script) const Q_DECL_OVERRIDE;
-    void releaseHandle(void *handle) Q_DECL_OVERRIDE;
-private:
-    QHash<IDWriteFontFile *, FontDescription> m_fonts;
-    QHash<QString, IDWriteFontFamily *> m_fontFamilies;
-};
-
-QT_END_NAMESPACE
-
-#endif // QWINRTFONTDATABASE_H
diff --git a/src/plugins/platforms/winrt/qwinrtinputcontext.cpp b/src/plugins/platforms/winrt/qwinrtinputcontext.cpp
index 3f476556ee..63e5b0cf27 100644
--- a/src/plugins/platforms/winrt/qwinrtinputcontext.cpp
+++ b/src/plugins/platforms/winrt/qwinrtinputcontext.cpp
@@ -39,6 +39,7 @@
 
 #include "qwinrtinputcontext.h"
 #include "qwinrtscreen.h"
+#include <QtGui/QGuiApplication>
 #include <QtGui/QWindow>
 #include <private/qeventdispatcher_winrt_p.h>
 
@@ -59,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
 Q_LOGGING_CATEGORY(lcQpaInputMethods, "qt.qpa.input.methods")
 
-inline QRectF getInputPaneRect(IInputPane *pane, qreal scaleFactor)
+inline QRectF getInputPaneRect(ComPtr<IInputPane> pane, qreal scaleFactor)
 {
     Rect rect;
     pane->get_OccludedRect(&rect);
@@ -85,28 +86,33 @@ QWinRTInputContext::QWinRTInputContext(QWinRTScreen *screen)
 {
     qCDebug(lcQpaInputMethods) << __FUNCTION__ << screen;
 
-    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) {
+            EventRegistrationToken showToken, hideToken;
+            inputPane->add_Showing(Callback<InputPaneVisibilityHandler>(
+                this, &QWinRTInputContext::onShowing).Get(), &showToken);
+            inputPane->add_Hiding(Callback<InputPaneVisibilityHandler>(
+                this, &QWinRTInputContext::onHiding).Get(), &hideToken);
+
+            m_keyboardRect = getInputPaneRect(inputPane, m_screen->scaleFactor());
+            m_isInputPanelVisible = !m_keyboardRect.isEmpty();
+        } else {
+            qWarning("failed to retrieve InputPane.");
+        }
+        return S_OK;
+    });
 
-    IInputPane *inputPane;
-    statics->GetForCurrentView(&inputPane);
-    statics->Release();
-    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);
-
-        m_keyboardRect = getInputPaneRect(inputPane, m_screen->scaleFactor());
-        m_isInputPanelVisible = !m_keyboardRect.isEmpty();
-    } else {
-        qWarning("failed to retrieve InputPane.");
-    }
+    connect(QGuiApplication::inputMethod(), &QInputMethod::cursorRectangleChanged,
+            this, &QWinRTInputContext::updateScreenCursorRect);
 }
 
 QRectF QWinRTInputContext::keyboardRect() const
@@ -119,6 +125,11 @@ bool QWinRTInputContext::isInputPanelVisible() const
     return m_isInputPanelVisible;
 }
 
+void QWinRTInputContext::updateScreenCursorRect()
+{
+    m_screen->setCursorRect(QGuiApplication::inputMethod()->cursorRectangle());
+}
+
 HRESULT QWinRTInputContext::onShowing(IInputPane *pane, IInputPaneVisibilityEventArgs *)
 {
     qCDebug(lcQpaInputMethods) << __FUNCTION__ << pane;
@@ -141,6 +152,7 @@ HRESULT QWinRTInputContext::handleVisibilityChange(IInputPane *pane)
     const QRectF keyboardRect = getInputPaneRect(pane, m_screen->scaleFactor());
     if (m_keyboardRect != keyboardRect) {
         m_keyboardRect = keyboardRect;
+        m_screen->setKeyboardRect(m_keyboardRect);
         emitKeyboardRectChanged();
     }
     return S_OK;
diff --git a/src/plugins/platforms/winrt/qwinrtinputcontext.h b/src/plugins/platforms/winrt/qwinrtinputcontext.h
index 5e416bb99f..9d5c4187e2 100644
--- a/src/plugins/platforms/winrt/qwinrtinputcontext.h
+++ b/src/plugins/platforms/winrt/qwinrtinputcontext.h
@@ -79,6 +79,9 @@ public:
     void hideInputPanel();
 #endif
 
+private slots:
+    void updateScreenCursorRect();
+
 private:
     HRESULT onShowing(ABI::Windows::UI::ViewManagement::IInputPane *,
                       ABI::Windows::UI::ViewManagement::IInputPaneVisibilityEventArgs *);
@@ -89,6 +92,7 @@ private:
 
     QWinRTScreen *m_screen;
     QRectF m_keyboardRect;
+    QRectF m_cursorRect;
     bool m_isInputPanelVisible;
 };
 
diff --git a/src/plugins/platforms/winrt/qwinrtintegration.cpp b/src/plugins/platforms/winrt/qwinrtintegration.cpp
index 42b7f7e909..ffc3bbf077 100644
--- a/src/plugins/platforms/winrt/qwinrtintegration.cpp
+++ b/src/plugins/platforms/winrt/qwinrtintegration.cpp
@@ -45,7 +45,6 @@
 #include "qwinrtinputcontext.h"
 #include "qwinrtservices.h"
 #include "qwinrteglcontext.h"
-#include "qwinrtfontdatabase.h"
 #include "qwinrttheme.h"
 #include "qwinrtclipboard.h"
 #ifndef QT_NO_DRAGANDDROP
@@ -56,7 +55,8 @@
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QSurface>
 
-#include <QtPlatformSupport/private/qeglpbuffer_p.h>
+#include <QtFontDatabaseSupport/private/qwinrtfontdatabase_p.h>
+#include <QtEglSupport/private/qeglpbuffer_p.h>
 #include <qpa/qwindowsysteminterface.h>
 #include <qpa/qplatformwindow.h>
 #include <qpa/qplatformoffscreensurface.h>
@@ -197,9 +197,9 @@ QWinRTIntegration::QWinRTIntegration() : d_ptr(new QWinRTIntegrationPrivate)
 
     QEventDispatcherWinRT::runOnXamlThread([d]() {
         d->mainScreen = new QWinRTScreen;
-        d->inputContext.reset(new QWinRTInputContext(d->mainScreen));
         return S_OK;
     });
+    d->inputContext.reset(new QWinRTInputContext(d->mainScreen));
 
     screenAdded(d->mainScreen);
     d->platformServices = new QWinRTServices;
diff --git a/src/plugins/platforms/winrt/qwinrtscreen.cpp b/src/plugins/platforms/winrt/qwinrtscreen.cpp
index c120de9d8f..6d4edcc8dc 100644
--- a/src/plugins/platforms/winrt/qwinrtscreen.cpp
+++ b/src/plugins/platforms/winrt/qwinrtscreen.cpp
@@ -625,7 +625,7 @@ int QWinRTScreen::depth() const
 
 QImage::Format QWinRTScreen::format() const
 {
-    return QImage::Format_ARGB32_Premultiplied;
+    return QImage::Format_RGB32;
 }
 
 QSizeF QWinRTScreen::physicalSize() const
@@ -753,12 +753,66 @@ void QWinRTScreen::initialize()
     onVisibilityChanged(nullptr, nullptr);
 }
 
+void QWinRTScreen::setCursorRect(const QRectF &cursorRect)
+{
+    mCursorRect = cursorRect;
+}
+
+void QWinRTScreen::setKeyboardRect(const QRectF &keyboardRect)
+{
+    Q_D(QWinRTScreen);
+    QRectF visibleRectF;
+    HRESULT hr;
+    Rect windowSize;
+
+    hr = d->coreWindow->get_Bounds(&windowSize);
+    if (FAILED(hr)) {
+        qErrnoWarning(hr, "Failed to get window bounds");
+        return;
+    }
+    d->logicalRect = QRectF(windowSize.X, windowSize.Y, windowSize.Width, windowSize.Height);
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP)
+    Rect visibleRect;
+    hr = d->view2->get_VisibleBounds(&visibleRect);
+    if (FAILED(hr)) {
+        qErrnoWarning(hr, "Failed to get window visible bounds");
+        return;
+    }
+    visibleRectF = QRectF(visibleRect.X, visibleRect.Y, visibleRect.Width, visibleRect.Height);
+#else
+    visibleRectF = d->logicalRect;
+#endif // WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP)
+    // if keyboard is snapped to the bottom of the screen and would cover the cursor the content is
+    // moved up to make it visible
+    if (keyboardRect.intersects(mCursorRect)
+            && qFuzzyCompare(geometry().height(), keyboardRect.y() + keyboardRect.height())) {
+        visibleRectF.moveTop(visibleRectF.top() - keyboardRect.height() / d->scaleFactor);
+    }
+    d->visibleRect = visibleRectF;
+
+    qCDebug(lcQpaWindows) << __FUNCTION__ << d->visibleRect;
+    QWindowSystemInterface::handleScreenGeometryChange(screen(), geometry(), availableGeometry());
+    QPlatformScreen::resizeMaximizedWindows();
+    handleExpose();
+}
+
 QWindow *QWinRTScreen::topWindow() const
 {
     Q_D(const QWinRTScreen);
     return d->visibleWindows.isEmpty() ? 0 : d->visibleWindows.first();
 }
 
+QWindow *QWinRTScreen::windowAt(const QPoint &pos)
+{
+    Q_D(const QWinRTScreen);
+    for (auto w : qAsConst(d->visibleWindows)) {
+        if (w->geometry().contains(pos))
+            return w;
+    }
+    qCDebug(lcQpaWindows) << __FUNCTION__ << ": No window found at:" << pos;
+    return nullptr;
+}
+
 void QWinRTScreen::addWindow(QWindow *window)
 {
     Q_D(QWinRTScreen);
@@ -767,8 +821,12 @@ void QWinRTScreen::addWindow(QWindow *window)
         return;
 
     d->visibleWindows.prepend(window);
-    updateWindowTitle(window->title());
-    QWindowSystemInterface::handleWindowActivated(window, Qt::OtherFocusReason);
+    const Qt::WindowType type = window->type();
+    if (type != Qt::Popup && type != Qt::ToolTip && type != Qt::Tool) {
+        updateWindowTitle(window->title());
+        QWindowSystemInterface::handleWindowActivated(window, Qt::OtherFocusReason);
+    }
+
     handleExpose();
     QWindowSystemInterface::flushWindowSystemEvents(QEventLoop::ExcludeUserInputEvents);
 
@@ -785,7 +843,9 @@ void QWinRTScreen::removeWindow(QWindow *window)
     const bool wasTopWindow = window == topWindow();
     if (!d->visibleWindows.removeAll(window))
         return;
-    if (wasTopWindow)
+
+    const Qt::WindowType type = window->type();
+    if (wasTopWindow && type != Qt::Popup && type != Qt::ToolTip && type != Qt::Tool)
         QWindowSystemInterface::handleWindowActivated(Q_NULLPTR, Qt::OtherFocusReason);
     handleExpose();
     QWindowSystemInterface::flushWindowSystemEvents(QEventLoop::ExcludeUserInputEvents);
@@ -1001,9 +1061,12 @@ HRESULT QWinRTScreen::onPointerUpdated(ICoreWindow *, IPointerEventArgs *args)
     pointerPoint->get_Position(&point);
     QPointF pos(point.X * d->scaleFactor, point.Y * d->scaleFactor);
     QPointF localPos = pos;
-    if (topWindow()) {
-        const QPointF globalPosDelta = pos - pos.toPoint();
-        localPos = topWindow()->mapFromGlobal(pos.toPoint()) + globalPosDelta;
+
+    const QPoint posPoint = pos.toPoint();
+    QWindow *targetWindow = windowAt(posPoint);
+    if (targetWindow) {
+        const QPointF globalPosDelta = pos - posPoint;
+        localPos = targetWindow->mapFromGlobal(posPoint) + globalPosDelta;
     }
 
     VirtualKeyModifiers modifiers;
@@ -1038,7 +1101,7 @@ HRESULT QWinRTScreen::onPointerUpdated(ICoreWindow *, IPointerEventArgs *args)
             boolean isHorizontal;
             properties->get_IsHorizontalMouseWheel(&isHorizontal);
             QPoint angleDelta(isHorizontal ? delta : 0, isHorizontal ? 0 : delta);
-            QWindowSystemInterface::handleWheelEvent(topWindow(), localPos, pos, QPoint(), angleDelta, mods);
+            QWindowSystemInterface::handleWheelEvent(targetWindow, localPos, pos, QPoint(), angleDelta, mods);
             break;
         }
 
@@ -1064,7 +1127,7 @@ HRESULT QWinRTScreen::onPointerUpdated(ICoreWindow *, IPointerEventArgs *args)
         if (isPressed)
             buttons |= Qt::XButton2;
 
-        QWindowSystemInterface::handleMouseEvent(topWindow(), localPos, pos, buttons, mods);
+        QWindowSystemInterface::handleMouseEvent(targetWindow, localPos, pos, buttons, mods);
 
         break;
     }
@@ -1122,7 +1185,7 @@ HRESULT QWinRTScreen::onPointerUpdated(ICoreWindow *, IPointerEventArgs *args)
         it.value().normalPosition = QPointF(point.X/d->logicalRect.width(), point.Y/d->logicalRect.height());
         it.value().pressure = pressure;
 
-        QWindowSystemInterface::handleTouchEvent(topWindow(), d->touchDevice, d->touchPoints.values(), mods);
+        QWindowSystemInterface::handleTouchEvent(targetWindow, d->touchDevice, d->touchPoints.values(), mods);
 
         // Fall-through for pen to generate tablet event
         if (pointerDeviceType != PointerDeviceType_Pen)
@@ -1141,7 +1204,7 @@ HRESULT QWinRTScreen::onPointerUpdated(ICoreWindow *, IPointerEventArgs *args)
         float rotation;
         properties->get_Twist(&rotation);
 
-        QWindowSystemInterface::handleTabletEvent(topWindow(), isPressed, pos, pos, 0,
+        QWindowSystemInterface::handleTabletEvent(targetWindow, isPressed, pos, pos, 0,
                                                   pointerType, pressure, xTilt, yTilt,
                                                   0, rotation, 0, id, mods);
 
diff --git a/src/plugins/platforms/winrt/qwinrtscreen.h b/src/plugins/platforms/winrt/qwinrtscreen.h
index 0e753b748b..e489e208d5 100644
--- a/src/plugins/platforms/winrt/qwinrtscreen.h
+++ b/src/plugins/platforms/winrt/qwinrtscreen.h
@@ -104,6 +104,7 @@ public:
     Qt::ScreenOrientation orientation() const Q_DECL_OVERRIDE;
 
     QWindow *topWindow() const;
+    QWindow *windowAt(const QPoint &pos);
     void addWindow(QWindow *window);
     void removeWindow(QWindow *window);
     void raise(QWindow *window);
@@ -116,6 +117,9 @@ public:
 
     void initialize();
 
+    void setCursorRect(const QRectF &cursorRect);
+    void setKeyboardRect(const QRectF &keyboardRect);
+
 private:
     void handleExpose();
 
@@ -140,6 +144,7 @@ private:
 #endif
 
     QScopedPointer<QWinRTScreenPrivate> d_ptr;
+    QRectF mCursorRect;
     Q_DECLARE_PRIVATE(QWinRTScreen)
 };
 
diff --git a/src/plugins/platforms/winrt/qwinrttheme.cpp b/src/plugins/platforms/winrt/qwinrttheme.cpp
index e9938894e6..f84688f045 100644
--- a/src/plugins/platforms/winrt/qwinrttheme.cpp
+++ b/src/plugins/platforms/winrt/qwinrttheme.cpp
@@ -369,6 +369,17 @@ QVariant QWinRTTheme::styleHint(QPlatformIntegration::StyleHint hint)
     return QVariant();
 }
 
+QVariant QWinRTTheme::themeHint(ThemeHint hint) const
+{
+    qCDebug(lcQpaTheme) << __FUNCTION__ << hint;
+    switch (hint) {
+    case StyleNames:
+        return QStringList() << QStringLiteral("fusion") << QStringLiteral("windows");
+    default:
+        return QPlatformTheme::themeHint(hint);
+    }
+}
+
 const QPalette *QWinRTTheme::palette(Palette type) const
 {
     Q_D(const QWinRTTheme);
diff --git a/src/plugins/platforms/winrt/qwinrttheme.h b/src/plugins/platforms/winrt/qwinrttheme.h
index 2b8817d014..bd244f9fdb 100644
--- a/src/plugins/platforms/winrt/qwinrttheme.h
+++ b/src/plugins/platforms/winrt/qwinrttheme.h
@@ -60,7 +60,7 @@ public:
     const QPalette *palette(Palette type = SystemPalette) const Q_DECL_OVERRIDE;
 
     static QVariant styleHint(QPlatformIntegration::StyleHint hint);
-
+    QVariant themeHint(ThemeHint hint) const override;
 private:
     QScopedPointer<QWinRTThemePrivate> d_ptr;
     Q_DECLARE_PRIVATE(QWinRTTheme)
diff --git a/src/plugins/platforms/winrt/qwinrtwindow.cpp b/src/plugins/platforms/winrt/qwinrtwindow.cpp
index 5b82183d40..297e6618d1 100644
--- a/src/plugins/platforms/winrt/qwinrtwindow.cpp
+++ b/src/plugins/platforms/winrt/qwinrtwindow.cpp
@@ -50,7 +50,7 @@
 #include <QtGui/QGuiApplication>
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QWindow>
-#include <QtPlatformSupport/private/qeglconvenience_p.h>
+#include <QtEglSupport/private/qeglconvenience_p.h>
 
 #include <functional>
 #include <wrl.h>
diff --git a/src/plugins/platforms/winrt/winrt.pro b/src/plugins/platforms/winrt/winrt.pro
index 28456f66ec..be2f5ca7e2 100644
--- a/src/plugins/platforms/winrt/winrt.pro
+++ b/src/plugins/platforms/winrt/winrt.pro
@@ -2,12 +2,13 @@ TARGET = qwinrt
 
 CONFIG -= precompile_header
 
-QT += core-private gui-private platformsupport-private
+QT += \
+    core-private gui-private \
+    fontdatabase_support-private egl_support-private
 
 DEFINES *= QT_NO_CAST_FROM_ASCII __WRL_NO_DEFAULT_LIB__
 
-LIBS += $$QMAKE_LIBS_CORE -ldwrite -ld3d11
-INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/freetype/include
+LIBS += $$QMAKE_LIBS_CORE -ld3d11
 
 SOURCES = \
     main.cpp  \
@@ -19,7 +20,6 @@ SOURCES = \
     qwinrteventdispatcher.cpp \
     qwinrtfiledialoghelper.cpp \
     qwinrtfileengine.cpp \
-    qwinrtfontdatabase.cpp \
     qwinrtinputcontext.cpp \
     qwinrtintegration.cpp \
     qwinrtmessagedialoghelper.cpp \
@@ -38,7 +38,6 @@ HEADERS = \
     qwinrteventdispatcher.h \
     qwinrtfiledialoghelper.h \
     qwinrtfileengine.h \
-    qwinrtfontdatabase.h \
     qwinrtinputcontext.h \
     qwinrtintegration.h \
     qwinrtmessagedialoghelper.h \