Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: Ia1da879a7bd8f71a649661a1844144dd67d60b3a
2019-10-17 09:41:36 +02:00 · 2019-10-17 09:41:36 +02:00 · 02164e0288
commit 02164e0288
parent 4a7e7103e7 6f27bb1352
135 changed files with 1108 additions and 648 deletions
--- a/config.tests/arch/write_info.pri
+++ b/config.tests/arch/write_info.pri
@ -4,10 +4,7 @@ targetinfofile ~= s/pro$/target.txt/
 win32 {
    ext = .exe
 } else:wasm {
-    equals(WASM_OBJECT_FILES, 1): \
-        ext = .o
-    else: \
-        ext = .wasm
+    ext = .wasm
 }

 content = $${file_prefix}$${TARGET}$${ext}
--- a/examples/corelib/mimetypes/mimetypebrowser/main.cpp
+++ b/examples/corelib/mimetypes/mimetypebrowser/main.cpp
@ -51,7 +51,7 @@
 #include "mainwindow.h"

 #include <QApplication>
-#include <QDesktopWidget>
+#include <QScreen>

 #include <QCommandLineParser>
 #include <QCommandLineOption>
@ -68,7 +68,7 @@ int main(int argc, char *argv[])
    parser.process(app);

    MainWindow mainWindow;
-    const QRect availableGeometry = QApplication::desktop()->availableGeometry(&mainWindow);
+    const QRect availableGeometry = mainWindow.screen()->availableGeometry();
    mainWindow.resize(availableGeometry.width() / 3, availableGeometry.height() / 2);
    mainWindow.show();

--- a/examples/network/http/main.cpp
+++ b/examples/network/http/main.cpp
@ -49,8 +49,8 @@
 ****************************************************************************/

 #include <QApplication>
-#include <QDesktopWidget>
 #include <QDir>
+#include <QScreen>

 #include "httpwindow.h"

@ -59,7 +59,7 @@ int main(int argc, char *argv[])
    QApplication app(argc, argv);

    HttpWindow httpWin;
-    const QRect availableSize = QApplication::desktop()->availableGeometry(&httpWin);
+    const QRect availableSize = httpWin.screen()->availableGeometry();
    httpWin.resize(availableSize.width() / 5, availableSize.height() / 5);
    httpWin.move((availableSize.width() - httpWin.width()) / 2, (availableSize.height() - httpWin.height()) / 2);

--- a/examples/opengl/threadedqopenglwidget/main.cpp
+++ b/examples/opengl/threadedqopenglwidget/main.cpp
@ -50,7 +50,7 @@

 #include <QApplication>
 #include <QMainWindow>
-#include <QDesktopWidget>
+#include <QScreen>
 #include <QSurfaceFormat>
 #include <QOpenGLContext>
 #include <QCommandLineParser>
@ -90,7 +90,7 @@ int main( int argc, char ** argv )
    // The rendering for the four QOpenGLWidgets happens on four separate threads.

    GLWidget topLevelGlWidget;
-    QPoint pos = QApplication::desktop()->availableGeometry(&topLevelGlWidget).topLeft() + QPoint(200, 200);
+    QPoint pos = topLevelGlWidget.screen()->availableGeometry().topLeft() + QPoint(200, 200);
    topLevelGlWidget.setWindowTitle(QStringLiteral("Threaded QOpenGLWidget example top level"));
    topLevelGlWidget.resize(200, 200);
    topLevelGlWidget.move(pos);
--- a/examples/widgets/desktop/screenshot/main.cpp
+++ b/examples/widgets/desktop/screenshot/main.cpp
@ -49,7 +49,7 @@
 ****************************************************************************/

 #include <QApplication>
-#include <QDesktopWidget>
+#include <QScreen>

 #include "screenshot.h"

@ -58,7 +58,8 @@ int main(int argc, char *argv[])
    QApplication app(argc, argv);

    Screenshot screenshot;
-    screenshot.move(QApplication::desktop()->availableGeometry(&screenshot).topLeft() + QPoint(20, 20));
+    screenshot.move(screenshot.screen()->availableGeometry().topLeft() + QPoint(20, 20));
    screenshot.show();
+
    return app.exec();
 }
--- a/examples/widgets/desktop/screenshot/screenshot.cpp
+++ b/examples/widgets/desktop/screenshot/screenshot.cpp
@ -59,7 +59,7 @@ Screenshot::Screenshot()
    screenshotLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
    screenshotLabel->setAlignment(Qt::AlignCenter);

-    const QRect screenGeometry = QApplication::desktop()->screenGeometry(this);
+    const QRect screenGeometry = screen()->geometry();
    screenshotLabel->setMinimumSize(screenGeometry.width() / 8, screenGeometry.height() / 8);

    QVBoxLayout *mainLayout = new QVBoxLayout(this);
--- a/examples/widgets/dialogs/standarddialogs/main.cpp
+++ b/examples/widgets/dialogs/standarddialogs/main.cpp
@ -49,8 +49,8 @@
 ****************************************************************************/

 #include <QApplication>
+#include <QScreen>
 #include <QStyleHints>
-#include <QDesktopWidget>
 #include <QTranslator>
 #include <QLocale>
 #include <QLibraryInfo>
@ -73,7 +73,7 @@ int main(int argc, char *argv[])

    Dialog dialog;
    if (!QGuiApplication::styleHints()->showIsFullScreen() && !QGuiApplication::styleHints()->showIsMaximized()) {
-        const QRect availableGeometry = QApplication::desktop()->availableGeometry(&dialog);
+        const QRect availableGeometry = dialog.screen()->availableGeometry();
        dialog.resize(availableGeometry.width() / 3, availableGeometry.height() * 2 / 3);
        dialog.move((availableGeometry.width() - dialog.width()) / 2,
                    (availableGeometry.height() - dialog.height()) / 2);
--- a/examples/widgets/itemviews/dirview/main.cpp
+++ b/examples/widgets/itemviews/dirview/main.cpp
@ -49,9 +49,9 @@
 ****************************************************************************/

 #include <QApplication>
-#include <QDesktopWidget>
 #include <QFileSystemModel>
 #include <QFileIconProvider>
+#include <QScreen>
 #include <QTreeView>
 #include <QCommandLineParser>
 #include <QCommandLineOption>
@ -92,7 +92,7 @@ int main(int argc, char *argv[])
    tree.setAnimated(false);
    tree.setIndentation(20);
    tree.setSortingEnabled(true);
-    const QSize availableSize = QApplication::desktop()->availableGeometry(&tree).size();
+    const QSize availableSize = tree.screen()->availableGeometry().size();
    tree.resize(availableSize / 2);
    tree.setColumnWidth(0, tree.width() / 3);

--- a/examples/widgets/mainwindows/application/mainwindow.cpp
+++ b/examples/widgets/mainwindows/application/mainwindow.cpp
@ -281,7 +281,7 @@ void MainWindow::readSettings()
    QSettings settings(QCoreApplication::organizationName(), QCoreApplication::applicationName());
    const QByteArray geometry = settings.value("geometry", QByteArray()).toByteArray();
    if (geometry.isEmpty()) {
-        const QRect availableGeometry = QApplication::desktop()->availableGeometry(this);
+        const QRect availableGeometry = screen()->availableGeometry();
        resize(availableGeometry.width() / 3, availableGeometry.height() / 2);
        move((availableGeometry.width() - width()) / 2,
             (availableGeometry.height() - height()) / 2);
--- a/examples/widgets/mainwindows/mdi/mainwindow.cpp
+++ b/examples/widgets/mainwindows/mdi/mainwindow.cpp
@ -464,7 +464,7 @@ void MainWindow::readSettings()
    QSettings settings(QCoreApplication::organizationName(), QCoreApplication::applicationName());
    const QByteArray geometry = settings.value("geometry", QByteArray()).toByteArray();
    if (geometry.isEmpty()) {
-        const QRect availableGeometry = QApplication::desktop()->availableGeometry(this);
+        const QRect availableGeometry = screen()->availableGeometry();
        resize(availableGeometry.width() / 3, availableGeometry.height() / 2);
        move((availableGeometry.width() - width()) / 2,
             (availableGeometry.height() - height()) / 2);
--- a/examples/widgets/mainwindows/sdi/mainwindow.cpp
+++ b/examples/widgets/mainwindows/sdi/mainwindow.cpp
@ -167,7 +167,7 @@ void MainWindow::tile(const QMainWindow *previous)
    if (!topFrameWidth)
        topFrameWidth = 40;
    const QPoint pos = previous->pos() + 2 * QPoint(topFrameWidth, topFrameWidth);
-    if (QApplication::desktop()->availableGeometry(this).contains(rect().bottomRight() + pos))
+    if (screen()->availableGeometry().contains(rect().bottomRight() + pos))
        move(pos);
 }

@ -290,7 +290,7 @@ void MainWindow::readSettings()
    QSettings settings(QCoreApplication::organizationName(), QCoreApplication::applicationName());
    const QByteArray geometry = settings.value("geometry", QByteArray()).toByteArray();
    if (geometry.isEmpty()) {
-        const QRect availableGeometry = QApplication::desktop()->availableGeometry(this);
+        const QRect availableGeometry = screen()->availableGeometry();
        resize(availableGeometry.width() / 3, availableGeometry.height() / 2);
        move((availableGeometry.width() - width()) / 2,
             (availableGeometry.height() - height()) / 2);
--- a/examples/widgets/richtext/textedit/main.cpp
+++ b/examples/widgets/richtext/textedit/main.cpp
@ -51,9 +51,9 @@
 #include "textedit.h"

 #include <QApplication>
-#include <QDesktopWidget>
 #include <QCommandLineParser>
 #include <QCommandLineOption>
+#include <QScreen>

 int main(int argc, char *argv[])
 {
@ -72,7 +72,7 @@ int main(int argc, char *argv[])

    TextEdit mw;

-    const QRect availableGeometry = QApplication::desktop()->availableGeometry(&mw);
+    const QRect availableGeometry = mw.screen()->availableGeometry();
    mw.resize(availableGeometry.width() / 2, (availableGeometry.height() * 2) / 3);
    mw.move((availableGeometry.width() - mw.width()) / 2,
            (availableGeometry.height() - mw.height()) / 2);
--- a/examples/widgets/tools/codecs/mainwindow.cpp
+++ b/examples/widgets/tools/codecs/mainwindow.cpp
@ -54,12 +54,12 @@

 #include <QAction>
 #include <QApplication>
-#include <QDesktopWidget>
 #include <QFileDialog>
 #include <QMenuBar>
 #include <QMessageBox>
 #include <QPlainTextEdit>
 #include <QRegularExpression>
+#include <QScreen>
 #include <QTextCodec>
 #include <QTextStream>

@ -78,7 +78,7 @@ MainWindow::MainWindow()

    setWindowTitle(tr("Codecs"));

-    const QRect screenGeometry = QApplication::desktop()->screenGeometry(this);
+    const QRect screenGeometry = screen()->geometry();
    resize(screenGeometry.width() / 2, screenGeometry.height() * 2 / 3);
 }

@ -216,7 +216,7 @@ void MainWindow::encodingDialog()
 {
    if (!m_encodingDialog) {
        m_encodingDialog = new EncodingDialog(this);
-        const QRect screenGeometry = QApplication::desktop()->screenGeometry(this);
+        const QRect screenGeometry = screen()->geometry();
        m_encodingDialog->setMinimumWidth(screenGeometry.width() / 4);
    }
    m_encodingDialog->show();
--- a/examples/widgets/tools/codecs/previewform.cpp
+++ b/examples/widgets/tools/codecs/previewform.cpp
@ -52,12 +52,12 @@

 #include <QApplication>
 #include <QComboBox>
-#include <QDesktopWidget>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QLabel>
 #include <QPlainTextEdit>
 #include <QPushButton>
+#include <QScreen>
 #include <QTextCodec>
 #include <QTextStream>

@ -183,7 +183,7 @@ PreviewForm::PreviewForm(QWidget *parent)
    mainLayout->addWidget(statusLabel, 2, 0, 1, 2);
    mainLayout->addWidget(buttonBox, 3, 0, 1, 2);

-    const QRect screenGeometry = QApplication::desktop()->screenGeometry(this);
+    const QRect screenGeometry = screen()->geometry();
    resize(screenGeometry.width() * 2 / 5, screenGeometry.height() / 2);
 }

--- a/examples/widgets/tools/settingseditor/mainwindow.cpp
+++ b/examples/widgets/tools/settingseditor/mainwindow.cpp
@ -54,12 +54,12 @@

 #include <QAction>
 #include <QApplication>
-#include <QDesktopWidget>
 #include <QFileDialog>
 #include <QInputDialog>
 #include <QLineEdit>
 #include <QMenuBar>
 #include <QMessageBox>
+#include <QScreen>
 #include <QStandardPaths>
 #include <QStatusBar>

@ -74,7 +74,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
    fallbacksAct->setChecked(true);

    setWindowTitle(QCoreApplication::applicationName());
-    const QRect availableGeometry = QApplication::desktop()->availableGeometry(this);
+    const QRect availableGeometry = screen()->availableGeometry();
    adjustSize();
    move((availableGeometry.width() - width()) / 2, (availableGeometry.height() - height()) / 2);
 }
--- a/examples/widgets/tools/settingseditor/settingstree.cpp
+++ b/examples/widgets/tools/settingseditor/settingstree.cpp
@ -52,8 +52,8 @@
 #include "variantdelegate.h"

 #include <QApplication>
-#include <QDesktopWidget>
 #include <QHeaderView>
+#include <QScreen>
 #include <QSettings>

 SettingsTree::SettingsTree(QWidget *parent)
@ -93,7 +93,7 @@ void SettingsTree::setSettingsObject(const SettingsPtr &newSettings)

 QSize SettingsTree::sizeHint() const
 {
-    const QRect availableGeometry = QApplication::desktop()->availableGeometry(this);
+    const QRect availableGeometry = screen()->availableGeometry();
    return QSize(availableGeometry.width() * 2 / 3, availableGeometry.height() * 2 / 3);
 }

--- a/examples/widgets/widgets/charactermap/mainwindow.cpp
+++ b/examples/widgets/widgets/charactermap/mainwindow.cpp
@ -64,6 +64,7 @@
 #include <QMenuBar>
 #include <QPlainTextEdit>
 #include <QPushButton>
+#include <QScreen>
 #include <QScrollArea>
 #include <QStatusBar>
 #include <QTextStream>
@ -302,7 +303,7 @@ QString FontInfoDialog::text() const

 void MainWindow::showInfo()
 {
-    const QRect screenGeometry = QApplication::desktop()->screenGeometry(this);
+    const QRect screenGeometry = screen()->geometry();
    FontInfoDialog *dialog = new FontInfoDialog(this);
    dialog->setWindowTitle(tr("Fonts"));
    dialog->setAttribute(Qt::WA_DeleteOnClose);
--- a/examples/widgets/widgets/icons/main.cpp
+++ b/examples/widgets/widgets/icons/main.cpp
@ -50,7 +50,7 @@

 #include <QApplication>
 #include <QCommandLineParser>
-#include <QDesktopWidget>
+#include <QScreen>

 #include "mainwindow.h"

@ -77,7 +77,7 @@ int main(int argc, char *argv[])
    if (!commandLineParser.positionalArguments().isEmpty())
        mainWin.loadImages(commandLineParser.positionalArguments());

-    const QRect availableGeometry = QApplication::desktop()->availableGeometry(&mainWin);
+    const QRect availableGeometry = mainWin.screen()->availableGeometry();
    mainWin.resize(availableGeometry.width() / 2, availableGeometry.height() * 2 / 3);
    mainWin.move((availableGeometry.width() - mainWin.width()) / 2, (availableGeometry.height() - mainWin.height()) / 2);

--- a/examples/xml/dombookmarks/mainwindow.cpp
+++ b/examples/xml/dombookmarks/mainwindow.cpp
@ -63,7 +63,7 @@ MainWindow::MainWindow()
    statusBar()->showMessage(tr("Ready"));

    setWindowTitle(tr("DOM Bookmarks"));
-    const QSize availableSize = QApplication::desktop()->availableGeometry(this).size();
+    const QSize availableSize = screen()->availableGeometry().size();
    resize(availableSize.width() / 2, availableSize.height() / 3);
 }

--- a/examples/xml/saxbookmarks/mainwindow.cpp
+++ b/examples/xml/saxbookmarks/mainwindow.cpp
@ -74,7 +74,7 @@ MainWindow::MainWindow()
    statusBar()->showMessage(tr("Ready"));

    setWindowTitle(tr("SAX Bookmarks"));
-    const QSize availableSize = QApplication::desktop()->availableGeometry(this).size();
+    const QSize availableSize = screen()->availableGeometry().size();
    resize(availableSize.width() / 2, availableSize.height() / 3);
 }

--- a/examples/xml/streambookmarks/mainwindow.cpp
+++ b/examples/xml/streambookmarks/mainwindow.cpp
@ -75,7 +75,7 @@ MainWindow::MainWindow()
    statusBar()->showMessage(tr("Ready"));

    setWindowTitle(tr("QXmlStream Bookmarks"));
-    const QSize availableSize = QApplication::desktop()->availableGeometry(this).size();
+    const QSize availableSize = screen()->availableGeometry().size();
    resize(availableSize.width() / 2, availableSize.height() / 3);
 }
 //! [0]
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@ -1083,6 +1083,14 @@
        "win32_system_libs": {
            "label": "Windows System Libraries",
            "condition": "config.win32 && libs.advapi32 && libs.gdi32 && libs.kernel32 && libs.netapi32 && libs.ole32 && libs.shell32 && libs.uuid && libs.user32 && libs.winmm && libs.ws2_32"
+        },
+        "cborstream": {
+            "label": "CBOR stream I/O",
+            "purpose": "Provides support for reading and writing the CBOR binary format.
+
+Note that this is required for plugin loading. Qt GUI needs QPA plugins for basic operation.",
+            "section": "Utilities",
+            "output": [ "publicFeature" ]
        }
    },

--- a/src/corelib/global/qconfig-bootstrapped.h
+++ b/src/corelib/global/qconfig-bootstrapped.h
@ -74,6 +74,7 @@
 #else
 # define QT_FEATURE_alloca_malloc_h -1
 #endif
+#define QT_FEATURE_cborstream -1
 #define QT_CRYPTOGRAPHICHASH_ONLY_SHA1
 #define QT_FEATURE_cxx11_random (QT_HAS_INCLUDE(<random>) ? 1 : -1)
 #define QT_NO_DATASTREAM
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@ -47,12 +47,11 @@
 #include "qoperatingsystemversion.h"
 #include "qoperatingsystemversion_p.h"
 #if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN) || defined(Q_OS_WINRT)
-#include "qoperatingsystemversion_win_p.h"
-#  if QT_CONFIG(settings)
-#    include "qsettings.h"
-#    include "qvariant.h"
+#  include "qoperatingsystemversion_win_p.h"
+#  ifndef Q_OS_WINRT
+#    include "private/qwinregistry_p.h"
 #  endif
-#endif
+#endif // Q_OS_WIN || Q_OS_CYGWIN
 #include <private/qlocale_tools_p.h>

 #include <qmutex.h>
@ -2206,28 +2205,25 @@ const QSysInfo::WinVersion QSysInfo::WindowsVersion = QSysInfo::windowsVersion()
 QT_WARNING_POP
 #endif

-static QString readRegistryString(const QString &key, const QString &subKey)
+static QString readVersionRegistryString(const wchar_t *subKey)
 {
-#if QT_CONFIG(settings)
-    QSettings settings(key, QSettings::NativeFormat);
-    return settings.value(subKey).toString();
+#if !defined(QT_BUILD_QMAKE) && !defined(Q_OS_WINRT)
+     return QWinRegistryKey(HKEY_LOCAL_MACHINE, LR"(SOFTWARE\Microsoft\Windows NT\CurrentVersion)")
+            .stringValue(subKey);
 #else
-    Q_UNUSED(key);
-    Q_UNUSED(subKey);
-    return QString();
+     Q_UNUSED(subKey);
+     return QString();
 #endif
 }

-static inline QString windowsVersionKey() { return QStringLiteral(R"(HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion)"); }
-
 static inline QString windows10ReleaseId()
 {
-    return readRegistryString(windowsVersionKey(), QStringLiteral("ReleaseId"));
+    return readVersionRegistryString(L"ReleaseId");
 }

 static inline QString windows7Build()
 {
-    return readRegistryString(windowsVersionKey(), QStringLiteral("CurrentBuild"));
+    return readVersionRegistryString(L"CurrentBuild");
 }

 static QString winSp_helper()
@ -3094,6 +3090,7 @@ QByteArray QSysInfo::machineUniqueId()
    }
 #elif defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
    // Let's poke at the registry
+    // ### Qt 6: Use new helpers from qwinregistry.cpp (once bootstrap builds are obsolete)
    HKEY key = NULL;
    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Cryptography", 0, KEY_READ | KEY_WOW64_64KEY, &key)
            == ERROR_SUCCESS) {
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@ -1575,9 +1575,12 @@ public:
        MatchContains = 1,
        MatchStartsWith = 2,
        MatchEndsWith = 3,
-        MatchRegExp = 4,
+#if QT_DEPRECATED_SINCE(5, 15)
+        MatchRegExp Q_DECL_ENUMERATOR_DEPRECATED_X("MatchRegExp is deprecated. Use MatchRegularExpression instead") = 4,
+#endif
        MatchWildcard = 5,
        MatchFixedString = 8,
+        MatchRegularExpression = 9,
        MatchCaseSensitive = 16,
        MatchWrap = 32,
        MatchRecursive = 64
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@ -2840,24 +2840,32 @@
    This enum describes the type of matches that can be used when searching
    for items in a model.

-    \value MatchExactly     Performs QVariant-based matching.
-    \value MatchFixedString Performs string-based matching.
+    \value MatchExactly            Performs QVariant-based matching.
+    \value MatchFixedString        Performs string-based matching.
           String-based comparisons are case-insensitive unless the
           \c MatchCaseSensitive flag is also specified.
-    \value MatchContains    The search term is contained in the item.
-    \value MatchStartsWith  The search term matches the start of the item.
-    \value MatchEndsWith    The search term matches the end of the item.
-    \value MatchCaseSensitive  The search is case sensitive.
-    \value MatchRegExp      Performs string-based matching using a regular
-           expression as the search term.
-    \value MatchWildcard    Performs string-based matching using a string with
+    \value MatchContains           The search term is contained in the item.
+    \value MatchStartsWith         The search term matches the start of the item.
+    \value MatchEndsWith           The search term matches the end of the item.
+    \value MatchCaseSensitive      The search is case sensitive.
+    \value MatchRegExp             Performs string-based matching using a regular
+           expression as the search term. Uses the deprecated QRegExp class.
+           \e{This enum value is deprecated since Qt 5.15.}
+    \value MatchRegularExpression  Performs string-based matching using a regular
+           expression as the search term. Uses QRegularExpression.
+           When using this flag, a QRegularExpression object can be passed as
+           parameter and will directly be used to perform the search. The case
+           sensitivity flag will be ignored as the QRegularExpression object is
+           expected to be fully configured.
+           This enum value was added in Qt 5.15.
+    \value MatchWildcard           Performs string-based matching using a string with
           wildcards as the search term.
-    \value MatchWrap        Perform a search that wraps around, so that when
+    \value MatchWrap               Perform a search that wraps around, so that when
           the search reaches the last item in the model, it begins again at
           the first item and continues until all items have been examined.
-    \value MatchRecursive   Searches the entire hierarchy.
+    \value MatchRecursive          Searches the entire hierarchy.

-    \sa QString::compare(), QRegExp
+    \sa QString::compare(), QRegExp, QRegularExpression
 */

 /*!
--- a/src/corelib/io/qsettings_win.cpp
+++ b/src/corelib/io/qsettings_win.cpp
@ -136,6 +136,8 @@ static void mergeKeySets(NameSet *dest, const QStringList &src)
 ** Wrappers for the insane windows registry API
 */

+// ### Qt 6: Use new helpers from qwinregistry.cpp (once bootstrap builds are obsolete)
+
 // Open a key with the specified "perms".
 // "access" is to explicitly use the 32- or 64-bit branch.
 static HKEY openKey(HKEY parentHandle, REGSAM perms, const QString &rSubKey, REGSAM access = 0)
--- a/src/corelib/itemmodels/qabstractitemmodel.cpp
+++ b/src/corelib/itemmodels/qabstractitemmodel.cpp
@ -46,6 +46,7 @@
 #include <qdebug.h>
 #include <qvector.h>
 #include <qregexp.h>
+#include <qregularexpression.h>
 #include <qstack.h>
 #include <qbitarray.h>
 #include <qdatetime.h>
@ -2358,6 +2359,7 @@ QModelIndexList QAbstractItemModel::match(const QModelIndex &start, int role,
    bool wrap = flags & Qt::MatchWrap;
    bool allHits = (hits == -1);
    QString text; // only convert to a string if it is needed
+    QRegularExpression rx; // only create it if needed
    const int column = start.column();
    QModelIndex p = parent(start);
    int from = start.row();
@ -2374,17 +2376,39 @@ QModelIndexList QAbstractItemModel::match(const QModelIndex &start, int role,
            if (matchType == Qt::MatchExactly) {
                if (value == v)
                    result.append(idx);
-            } else { // QString based matching
-                if (text.isEmpty()) // lazy conversion
-                    text = value.toString();
+            } else { // QString or regular expression based matching
+                if (matchType == Qt::MatchRegularExpression) {
+                    if (rx.pattern().isEmpty()) {
+                        if (value.type() == QVariant::RegularExpression) {
+                            rx = value.toRegularExpression();
+                        } else {
+                            rx.setPattern(value.toString());
+                            if (cs == Qt::CaseInsensitive)
+                                rx.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
+                        }
+                    }
+                } else if (matchType == Qt::MatchWildcard) {
+                    if (rx.pattern().isEmpty())
+                        rx.setPattern(QRegularExpression::wildcardToRegularExpression(value.toString()));
+                    if (cs == Qt::CaseInsensitive)
+                        rx.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
+                } else {
+                    if (text.isEmpty()) // lazy conversion
+                        text = value.toString();
+                }
+
                QString t = v.toString();
                switch (matchType) {
+#if QT_DEPRECATED_SINCE(5, 15)
                case Qt::MatchRegExp:
                    if (QRegExp(text, cs).exactMatch(t))
                        result.append(idx);
                    break;
+#endif
+                case Qt::MatchRegularExpression:
+                    Q_FALLTHROUGH();
                case Qt::MatchWildcard:
-                    if (QRegExp(text, cs, QRegExp::Wildcard).exactMatch(t))
+                    if (t.contains(rx))
                        result.append(idx);
                    break;
                case Qt::MatchStartsWith:
--- a/src/corelib/kernel/kernel.pri
+++ b/src/corelib/kernel/kernel.pri
@ -88,8 +88,10 @@ win32 {
            SOURCES += kernel/qeventdispatcher_winrt.cpp
            HEADERS += kernel/qeventdispatcher_winrt_p.h
        } else {
-            SOURCES += kernel/qeventdispatcher_win.cpp
-            HEADERS += kernel/qeventdispatcher_win_p.h
+            SOURCES += kernel/qeventdispatcher_win.cpp \
+                       kernel/qwinregistry.cpp
+            HEADERS += kernel/qeventdispatcher_win_p.h \
+                       kernel/qwinregistry_p.h
        }

        !winrt: LIBS_PRIVATE += -lversion
--- a/src/corelib/kernel/qwinregistry.cpp
+++ b/src/corelib/kernel/qwinregistry.cpp
@ -0,0 +1,120 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module 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 "qwinregistry_p.h"
+
+#include <QtCore/qvarlengtharray.h>
+
+#include <algorithm>
+
+QT_BEGIN_NAMESPACE
+
+QWinRegistryKey::QWinRegistryKey() :
+    m_key(nullptr)
+{
+}
+
+// Open a key with the specified permissions (KEY_READ/KEY_WRITE).
+// "access" is to explicitly use the 32- or 64-bit branch.
+QWinRegistryKey::QWinRegistryKey(HKEY parentHandle, QStringView subKey,
+                                 REGSAM permissions, REGSAM access)
+{
+    if (RegOpenKeyEx(parentHandle, reinterpret_cast<const wchar_t *>(subKey.utf16()),
+                     0, permissions | access, &m_key) != ERROR_SUCCESS) {
+        m_key = nullptr;
+    }
+}
+
+QWinRegistryKey::~QWinRegistryKey()
+{
+    close();
+}
+
+void QWinRegistryKey::close()
+{
+    if (isValid()) {
+        RegCloseKey(m_key);
+        m_key = nullptr;
+    }
+}
+
+QString QWinRegistryKey::stringValue(QStringView subKey) const
+{
+    QString result;
+    if (!isValid())
+        return result;
+    DWORD type;
+    DWORD size;
+    auto subKeyC = reinterpret_cast<const wchar_t *>(subKey.utf16());
+    if (RegQueryValueEx(m_key, subKeyC, nullptr, &type, nullptr, &size) != ERROR_SUCCESS
+        || (type != REG_SZ && type != REG_EXPAND_SZ) || size <= 2) {
+        return result;
+    }
+    // Reserve more for rare cases where trailing '\0' are missing in registry,
+    // otherwise chop off the '\0' received.
+    QString buffer(int(size / sizeof(wchar_t)), Qt::Uninitialized);
+    if (RegQueryValueEx(m_key, subKeyC, nullptr, &type,
+                        reinterpret_cast<LPBYTE>(buffer.data()), &size) == ERROR_SUCCESS) {
+        if (buffer.endsWith(QChar::Null))
+            buffer.chop(1);
+    } else {
+        buffer.clear();
+    }
+    return buffer;
+}
+
+QPair<DWORD, bool> QWinRegistryKey::dwordValue(QStringView subKey) const
+{
+    if (!isValid())
+        return qMakePair(0, false);
+    DWORD type;
+    auto subKeyC = reinterpret_cast<const wchar_t *>(subKey.utf16());
+    if (RegQueryValueEx(m_key, subKeyC, nullptr, &type, nullptr, nullptr) != ERROR_SUCCESS
+        || type != REG_DWORD) {
+        return qMakePair(0, false);
+    }
+    DWORD value = 0;
+    DWORD size = sizeof(value);
+    const bool ok =
+        RegQueryValueEx(m_key, subKeyC, nullptr, nullptr,
+                        reinterpret_cast<unsigned char *>(&value), &size) == ERROR_SUCCESS;
+    return qMakePair(value, ok);
+}
+
+QT_END_NAMESPACE
--- a/src/plugins/platforms/android/androidplatformplugin.cpp
+++ b/src/plugins/platforms/android/androidplatformplugin.cpp
@ -1,9 +1,9 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 BogDan Vatra <bogdan@kde.org>
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@ -37,28 +37,53 @@
 **
 ****************************************************************************/

-#include <qpa/qplatformintegrationplugin.h>
-#include "qandroidplatformintegration.h"
+#ifndef QWINREGISTRY_H
+#define QWINREGISTRY_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qpair.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qstringview.h>
+#include <QtCore/qt_windows.h>

 QT_BEGIN_NAMESPACE

-class QAndroidPlatformIntegrationPlugin: public QPlatformIntegrationPlugin
+class Q_CORE_EXPORT QWinRegistryKey
 {
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "android.json")
 public:
-    QPlatformIntegration *create(const QString &key, const QStringList &paramList) override;
+    Q_DISABLE_COPY(QWinRegistryKey)
+
+    QWinRegistryKey();
+    explicit QWinRegistryKey(HKEY parentHandle, QStringView subKey,
+                             REGSAM permissions = KEY_READ, REGSAM access = 0);
+    ~QWinRegistryKey();
+
+    QWinRegistryKey(QWinRegistryKey &&other) noexcept { swap(other); }
+    QWinRegistryKey &operator=(QWinRegistryKey &&other) noexcept { swap(other); return *this; }
+
+    void swap(QWinRegistryKey &other) noexcept { qSwap(m_key, other.m_key); }
+
+    bool isValid() const { return m_key != nullptr; }
+    operator HKEY() const { return m_key; }
+    void close();
+
+    QString stringValue(QStringView subKey) const;
+    QPair<DWORD, bool> dwordValue(QStringView subKey) const;
+
+private:
+    HKEY m_key;
 };

-
-QPlatformIntegration *QAndroidPlatformIntegrationPlugin::create(const QString &key, const QStringList &paramList)
-{
-    Q_UNUSED(paramList);
-    if (!key.compare(QLatin1String("android"), Qt::CaseInsensitive))
-        return new QAndroidPlatformIntegration(paramList);
-    return 0;
-}
-
 QT_END_NAMESPACE
-#include "androidplatformplugin.moc"

+#endif // QWINREGISTRY_H
--- a/src/corelib/serialization/qcborstream.h
+++ b/src/corelib/serialization/qcborstream.h
@ -47,6 +47,8 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qstringview.h>

+QT_REQUIRE_CONFIG(cborstream);
+
 // See qcborcommon.h for why we check
 #if defined(QT_X11_DEFINES_FOUND)
 #  undef True
--- a/src/corelib/serialization/qcborvalue.cpp
+++ b/src/corelib/serialization/qcborvalue.cpp
@ -42,7 +42,10 @@
 #include "qdatastream.h"
 #include "qcborarray.h"
 #include "qcbormap.h"
+
+#if QT_CONFIG(cborstream)
 #include "qcborstream.h"
+#endif

 #include <qendian.h>
 #include <qlocale.h>
@ -758,6 +761,7 @@ QT_BEGIN_NAMESPACE

 using namespace QtCbor;

+#if QT_CONFIG(cborstream)
 // in qcborstream.cpp
 extern void qt_cbor_stream_set_error(QCborStreamReaderPrivate *d, QCborError error);

@ -799,6 +803,7 @@ static void writeDoubleToCbor(QCborStreamWriter &writer, double d, QCborValue::E

    writer.append(d);
 }
+#endif // QT_CONFIG(cborstream)

 static inline int typeOrder(Element e1, Element e2)
 {
@ -1221,6 +1226,7 @@ int QCborMap::compare(const QCborMap &other) const noexcept
    return compareContainer(d.data(), other.d.data());
 }

+#if QT_CONFIG(cborstream)
 static void encodeToCbor(QCborStreamWriter &writer, const QCborContainerPrivate *d, qsizetype idx,
                         QCborValue::EncodingOptions opt)
 {
@ -1632,6 +1638,7 @@ void QCborContainerPrivate::decodeFromCbor(QCborStreamReader &reader)
    if (reader.lastError() == QCborError::NoError)
        reader.leaveContainer();
 }
+#endif // QT_CONFIG(cborstream)

 /*!
    Creates a QCborValue with byte array value \a ba. The value can later be
@ -1765,6 +1772,7 @@ QCborValue::QCborValue(const QDateTime &dt)
    container->elements[1].type = String;
 }

+#ifndef QT_BOOTSTRAPPED
 /*!
    Creates a QCborValue object of the URL extended type and containing the
    value represented by \a url. The value can later be retrieved using toUrl().
@ -1781,6 +1789,7 @@ QCborValue::QCborValue(const QUrl &url)
    t = Url;
    container->elements[1].type = String;
 }
+#endif

 #if QT_CONFIG(regularexpression)
 /*!
@ -1934,6 +1943,7 @@ QDateTime QCborValue::toDateTime(const QDateTime &defaultValue) const
    return QDateTime::fromString(byteData->asLatin1(), Qt::ISODateWithMs);
 }

+#ifndef QT_BOOTSTRAPPED
 /*!
    Returns the URL value stored in this QCborValue, if it is of the URL
    extended type. Otherwise, it returns \a defaultValue.
@ -1954,6 +1964,7 @@ QUrl QCborValue::toUrl(const QUrl &defaultValue) const

    return QUrl::fromEncoded(byteData->asByteArrayView());
 }
+#endif

 #if QT_CONFIG(regularexpression)
 /*!
@ -2326,6 +2337,7 @@ QCborValueRef QCborValue::operator[](qint64 key)
    return { container, index };
 }

+#if QT_CONFIG(cborstream)
 /*!
    Decodes one item from the CBOR stream found in \a reader and returns the
    equivalent representation. This function is recursive: if the item is a map
@ -2563,6 +2575,7 @@ void QCborValueRef::toCbor(QCborStreamWriter &writer, QCborValue::EncodingOption
 {
    concrete().toCbor(writer, opt);
 }
+#endif // QT_CONFIG(cborstream)

 void QCborValueRef::assign(QCborValueRef that, const QCborValue &other)
 {
@ -2882,8 +2895,10 @@ uint qHash(const QCborValue &value, uint seed)
        return qHash(value.toDouble(), seed);
    case QCborValue::DateTime:
        return qHash(value.toDateTime(), seed);
+#ifndef QT_BOOTSTRAPPED
    case QCborValue::Url:
        return qHash(value.toUrl(), seed);
+#endif
 #if QT_CONFIG(regularexpression)
    case QCborValue::RegularExpression:
        return qHash(value.toRegularExpression(), seed);
@ -2936,8 +2951,10 @@ static QDebug debugContents(QDebug &dbg, const QCborValue &v)
    }
    case QCborValue::DateTime:
        return dbg << v.toDateTime();
+#ifndef QT_BOOTSTRAPPED
    case QCborValue::Url:
        return dbg << v.toUrl();
+#endif
 #if QT_CONFIG(regularexpression)
    case QCborValue::RegularExpression:
        return dbg << v.toRegularExpression();
--- a/src/corelib/serialization/qcborvalue.h
+++ b/src/corelib/serialization/qcborvalue.h
@ -161,7 +161,9 @@ public:
    {}

    explicit QCborValue(const QDateTime &dt);
+#ifndef QT_BOOTSTRAPPED
    explicit QCborValue(const QUrl &url);
+#endif
 #if QT_CONFIG(regularexpression)
    explicit QCborValue(const QRegularExpression &rx);
 #endif
@ -283,6 +285,7 @@ public:
    static QCborValue fromJsonValue(const QJsonValue &v);
    QJsonValue toJsonValue() const;

+#if QT_CONFIG(cborstream)
    static QCborValue fromCbor(QCborStreamReader &reader);
    static QCborValue fromCbor(const QByteArray &ba, QCborParserError *error = nullptr);
    static QCborValue fromCbor(const char *data, qsizetype len, QCborParserError *error = nullptr)
@ -291,6 +294,7 @@ public:
    { return fromCbor(QByteArray(reinterpret_cast<const char *>(data), int(len)), error); }
    QByteArray toCbor(EncodingOptions opt = NoTransformation);
    void toCbor(QCborStreamWriter &writer, EncodingOptions opt = NoTransformation);
+#endif

    QString toDiagnosticNotation(DiagnosticNotationOptions opts = Compact) const;

@ -387,8 +391,10 @@ public:
    { return concrete().toString(defaultValue); }
    QDateTime toDateTime(const QDateTime &defaultValue = {}) const
    { return concrete().toDateTime(defaultValue); }
+#ifndef QT_BOOTSTRAPPED
    QUrl toUrl(const QUrl &defaultValue = {}) const
    { return concrete().toUrl(defaultValue); }
+#endif
 #if QT_CONFIG(regularexpression)
    QRegularExpression toRegularExpression(const QRegularExpression &defaultValue = {}) const
    { return concrete().toRegularExpression(defaultValue); }
@ -431,9 +437,11 @@ public:
    QVariant toVariant() const                  { return concrete().toVariant(); }
    QJsonValue toJsonValue() const;

+#if QT_CONFIG(cborstream)
    QByteArray toCbor(QCborValue::EncodingOptions opt = QCborValue::NoTransformation)
    { return concrete().toCbor(opt); }
    void toCbor(QCborStreamWriter &writer, QCborValue::EncodingOptions opt = QCborValue::NoTransformation);
+#endif

    QString toDiagnosticNotation(QCborValue::DiagnosticNotationOptions opt = QCborValue::Compact)
    { return concrete().toDiagnosticNotation(opt); }
--- a/src/corelib/serialization/qjsonobject.cpp
+++ b/src/corelib/serialization/qjsonobject.cpp
@ -1092,6 +1092,23 @@ QJsonObject::const_iterator QJsonObject::constFindImpl(T key) const
    Returns a pointer to a modifiable reference to the current item.
 */

+/*! \fn QJsonValueRef QJsonObject::iterator::operator[](int j) const
+
+    Returns a modifiable reference to the item at offset \a j from the
+    item pointed to by this iterator (the item at position \c{*this + j}).
+
+    This function is provided to make QJsonObject iterators behave like C++
+    pointers.
+
+    The return value is of type QJsonValueRef, a helper class for QJsonArray
+    and QJsonObject. When you get an object of type QJsonValueRef, you can
+    use it as if it were a reference to a QJsonValue. If you assign to it,
+    the assignment will apply to the element in the QJsonArray or QJsonObject
+    from which you got the reference.
+
+    \sa operator+()
+*/
+
 /*!
    \fn bool QJsonObject::iterator::operator==(const iterator &other) const
    \fn bool QJsonObject::iterator::operator==(const const_iterator &other) const
@ -1112,6 +1129,38 @@ QJsonObject::const_iterator QJsonObject::constFindImpl(T key) const
    \sa operator==()
 */

+/*!
+    \fn bool QJsonObject::iterator::operator<(const iterator& other) const
+    \fn bool QJsonObject::iterator::operator<(const const_iterator& other) const
+
+    Returns \c true if the item pointed to by this iterator is less than
+    the item pointed to by the \a other iterator.
+*/
+
+/*!
+    \fn bool QJsonObject::iterator::operator<=(const iterator& other) const
+    \fn bool QJsonObject::iterator::operator<=(const const_iterator& other) const
+
+    Returns \c true if the item pointed to by this iterator is less than
+    or equal to the item pointed to by the \a other iterator.
+*/
+
+/*!
+    \fn bool QJsonObject::iterator::operator>(const iterator& other) const
+    \fn bool QJsonObject::iterator::operator>(const const_iterator& other) const
+
+    Returns \c true if the item pointed to by this iterator is greater
+    than the item pointed to by the \a other iterator.
+*/
+
+/*!
+    \fn bool QJsonObject::iterator::operator>=(const iterator& other) const
+    \fn bool QJsonObject::iterator::operator>=(const const_iterator& other) const
+
+    Returns \c true if the item pointed to by this iterator is greater
+    than or equal to the item pointed to by the \a other iterator.
+*/
+
 /*! \fn QJsonObject::iterator QJsonObject::iterator::operator++()

    The prefix ++ operator, \c{++i}, advances the iterator to the
@ -1185,6 +1234,12 @@ QJsonObject::const_iterator QJsonObject::constFindImpl(T key) const
    \sa operator+=(), operator-()
 */

+/*! \fn int QJsonObject::iterator::operator-(iterator other) const
+
+    Returns the number of items between the item pointed to by \a
+    other and the item pointed to by this iterator.
+*/
+
 /*!
    \class QJsonObject::const_iterator
    \inmodule QtCore
@ -1288,6 +1343,18 @@ QJsonObject::const_iterator QJsonObject::constFindImpl(T key) const
    Returns a pointer to the current item.
 */

+/*! \fn QJsonValue QJsonObject::const_iterator::operator[](int j) const
+
+    Returns the item at offset \a j from the item pointed to by this iterator (the item at
+    position \c{*this + j}).
+
+    This function is provided to make QJsonObject iterators behave like C++
+    pointers.
+
+    \sa operator+()
+*/
+
+
 /*! \fn bool QJsonObject::const_iterator::operator==(const const_iterator &other) const
    \fn bool QJsonObject::const_iterator::operator==(const iterator &other) const

@ -1306,6 +1373,34 @@ QJsonObject::const_iterator QJsonObject::constFindImpl(T key) const
    \sa operator==()
 */

+/*!
+    \fn bool QJsonObject::const_iterator::operator<(const const_iterator& other) const
+
+    Returns \c true if the item pointed to by this iterator is less than
+    the item pointed to by the \a other iterator.
+*/
+
+/*!
+    \fn bool QJsonObject::const_iterator::operator<=(const const_iterator& other) const
+
+    Returns \c true if the item pointed to by this iterator is less than
+    or equal to the item pointed to by the \a other iterator.
+*/
+
+/*!
+    \fn bool QJsonObject::const_iterator::operator>(const const_iterator& other) const
+
+    Returns \c true if the item pointed to by this iterator is greater
+    than the item pointed to by the \a other iterator.
+*/
+
+/*!
+    \fn bool QJsonObject::const_iterator::operator>=(const const_iterator& other) const
+
+    Returns \c true if the item pointed to by this iterator is greater
+    than or equal to the item pointed to by the \a other iterator.
+*/
+
 /*! \fn QJsonObject::const_iterator QJsonObject::const_iterator::operator++()

    The prefix ++ operator, \c{++i}, advances the iterator to the
@ -1386,6 +1481,12 @@ QJsonObject::const_iterator QJsonObject::constFindImpl(T key) const
    \sa operator+=(), operator-()
 */

+/*! \fn int QJsonObject::const_iterator::operator-(const_iterator other) const
+
+    Returns the number of items between the item pointed to by \a
+    other and the item pointed to by this iterator.
+*/
+

 /*!
    \internal
--- a/src/corelib/serialization/qjsonobject.h
+++ b/src/corelib/serialization/qjsonobject.h
@ -154,8 +154,14 @@ public:
 #else
        inline QJsonValueRefPtr operator->() const { return QJsonValueRefPtr(o, i); }
 #endif
+        const QJsonValueRef operator[](int j) { return QJsonValueRef(o, i + j); }
+
        inline bool operator==(const iterator &other) const { return i == other.i; }
        inline bool operator!=(const iterator &other) const { return i != other.i; }
+        bool operator<(const iterator& other) const { return i < other.i; }
+        bool operator<=(const iterator& other) const { return i <= other.i; }
+        bool operator>(const iterator& other) const { return i > other.i; }
+        bool operator>=(const iterator& other) const { return i >= other.i; }

        inline iterator &operator++() { ++i; return *this; }
        inline iterator operator++(int) { iterator r = *this; ++i; return r; }
@ -166,10 +172,15 @@ public:
        inline iterator operator-(int j) const { return operator+(-j); }
        inline iterator &operator+=(int j) { i += j; return *this; }
        inline iterator &operator-=(int j) { i -= j; return *this; }
+        int operator-(iterator j) const { return i - j.i; }

    public:
        inline bool operator==(const const_iterator &other) const { return i == other.i; }
        inline bool operator!=(const const_iterator &other) const { return i != other.i; }
+        bool operator<(const const_iterator& other) const { return i < other.i; }
+        bool operator<=(const const_iterator& other) const { return i <= other.i; }
+        bool operator>(const const_iterator& other) const { return i > other.i; }
+        bool operator>=(const const_iterator& other) const { return i >= other.i; }
    };
    friend class iterator;

@ -200,8 +211,14 @@ public:
 #else
        inline QJsonValuePtr operator->() const { return QJsonValuePtr(o->valueAt(i)); }
 #endif
+        const QJsonValue operator[](int j) { return o->valueAt(i + j); }
+
        inline bool operator==(const const_iterator &other) const { return i == other.i; }
        inline bool operator!=(const const_iterator &other) const { return i != other.i; }
+        bool operator<(const const_iterator& other) const { return i < other.i; }
+        bool operator<=(const const_iterator& other) const { return i <= other.i; }
+        bool operator>(const const_iterator& other) const { return i > other.i; }
+        bool operator>=(const const_iterator& other) const { return i >= other.i; }

        inline const_iterator &operator++() { ++i; return *this; }
        inline const_iterator operator++(int) { const_iterator r = *this; ++i; return r; }
@ -212,9 +229,14 @@ public:
        inline const_iterator operator-(int j) const { return operator+(-j); }
        inline const_iterator &operator+=(int j) { i += j; return *this; }
        inline const_iterator &operator-=(int j) { i -= j; return *this; }
+        int operator-(iterator j) const { return i - j.i; }

        inline bool operator==(const iterator &other) const { return i == other.i; }
        inline bool operator!=(const iterator &other) const { return i != other.i; }
+        bool operator<(const iterator& other) const { return i < other.i; }
+        bool operator<=(const iterator& other) const { return i <= other.i; }
+        bool operator>(const iterator& other) const { return i > other.i; }
+        bool operator>=(const iterator& other) const { return i >= other.i; }
    };
    friend class const_iterator;

--- a/src/corelib/serialization/serialization.pri
+++ b/src/corelib/serialization/serialization.pri
@ -6,7 +6,6 @@ HEADERS += \
    serialization/qcbormap.h \
    serialization/qcborvalue.h \
    serialization/qcborvalue_p.h \
-    serialization/qcborstream.h \
    serialization/qdatastream.h \
    serialization/qdatastream_p.h \
    serialization/qjson_p.h \
@ -23,7 +22,6 @@ HEADERS += \
    serialization/qxmlutils_p.h

 SOURCES += \
-    serialization/qcborstream.cpp \
    serialization/qcbordiagnostic.cpp \
    serialization/qcborvalue.cpp \
    serialization/qdatastream.cpp \
@ -39,6 +37,14 @@ SOURCES += \
    serialization/qxmlstream.cpp \
    serialization/qxmlutils.cpp

+qtConfig(cborstream): {
+    SOURCES += \
+        serialization/qcborstream.cpp
+
+    HEADERS += \
+        serialization/qcborstream.h
+}
+
 false: SOURCES += \
    serialization/qcborarray.cpp \
    serialization/qcbormap.cpp
--- a/src/corelib/time/qtimezoneprivate_win.cpp
+++ b/src/corelib/time/qtimezoneprivate_win.cpp
@ -46,13 +46,14 @@

 #include <algorithm>

-QT_BEGIN_NAMESPACE
-
 #ifndef Q_OS_WINRT
+#include <private/qwinregistry_p.h>
 // The registry-based timezone backend is not available on WinRT, which falls back to equivalent APIs.
 #define QT_USE_REGISTRY_TIMEZONE 1
 #endif

+QT_BEGIN_NAMESPACE
+
 /*
    Private

@ -71,8 +72,8 @@ QT_BEGIN_NAMESPACE
 // Vista introduced support for historic data, see MSDN docs on DYNAMIC_TIME_ZONE_INFORMATION
 // http://msdn.microsoft.com/en-gb/library/windows/desktop/ms724253%28v=vs.85%29.aspx
 #ifdef QT_USE_REGISTRY_TIMEZONE
-static const char tzRegPath[] = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones";
-static const char currTzRegPath[] = "SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation";
+static const wchar_t tzRegPath[] = LR"(SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones)";
+static const wchar_t currTzRegPath[] = LR"(SYSTEM\CurrentControlSet\Control\TimeZoneInformation)";
 #endif

 enum {
@ -138,27 +139,6 @@ bool equalTzi(const TIME_ZONE_INFORMATION &tzi1, const TIME_ZONE_INFORMATION &tz
 }

 #ifdef QT_USE_REGISTRY_TIMEZONE
-bool openRegistryKey(const QString &keyPath, HKEY *key)
-{
-    return RegOpenKeyEx(HKEY_LOCAL_MACHINE, reinterpret_cast<const wchar_t*>(keyPath.utf16()),
-                        0, KEY_READ, key) == ERROR_SUCCESS;
-}
-
-QString readRegistryString(const HKEY &key, const wchar_t *value)
-{
-    wchar_t buffer[MAX_PATH] = {0};
-    DWORD size = sizeof(wchar_t) * MAX_PATH;
-    RegQueryValueEx(key, value, nullptr, nullptr, reinterpret_cast<LPBYTE>(buffer), &size);
-    return QString::fromWCharArray(buffer);
-}
-
-int readRegistryValue(const HKEY &key, const wchar_t *value)
-{
-    DWORD buffer;
-    DWORD size = sizeof(buffer);
-    RegQueryValueEx(key, value, nullptr, nullptr, reinterpret_cast<LPBYTE>(&buffer), &size);
-    return buffer;
-}

 QWinTimeZonePrivate::QWinTransitionRule readRegistryRule(const HKEY &key,
                                                         const wchar_t *value, bool *ok)
@ -185,12 +165,11 @@ TIME_ZONE_INFORMATION getRegistryTzi(const QByteArray &windowsId, bool *ok)
    TIME_ZONE_INFORMATION tzi;
    REG_TZI_FORMAT regTzi;
    DWORD regTziSize = sizeof(regTzi);
-    HKEY key = NULL;
-    const QString tziKeyPath = QString::fromUtf8(tzRegPath) + QLatin1Char('\\')
+    const QString tziKeyPath = QString::fromWCharArray(tzRegPath) + QLatin1Char('\\')
                               + QString::fromUtf8(windowsId);

-    if (openRegistryKey(tziKeyPath, &key)) {
-
+    QWinRegistryKey key(HKEY_LOCAL_MACHINE, tziKeyPath);
+    if (key.isValid()) {
        DWORD size = sizeof(tzi.DaylightName);
        RegQueryValueEx(key, L"Dlt", nullptr, nullptr, reinterpret_cast<LPBYTE>(tzi.DaylightName), &size);

@ -206,8 +185,6 @@ TIME_ZONE_INFORMATION getRegistryTzi(const QByteArray &windowsId, bool *ok)
            tzi.DaylightDate = regTzi.DaylightDate;
            *ok = true;
        }
-
-        RegCloseKey(key);
    }

    return tzi;
@ -299,8 +276,8 @@ QList<QByteArray> availableWindowsIds()
 #ifdef QT_USE_REGISTRY_TIMEZONE
    // TODO Consider caching results in a global static, very unlikely to change.
    QList<QByteArray> list;
-    HKEY key = NULL;
-    if (openRegistryKey(QString::fromUtf8(tzRegPath), &key)) {
+    QWinRegistryKey key(HKEY_LOCAL_MACHINE, tzRegPath);
+    if (key.isValid()) {
        DWORD idCount = 0;
        if (RegQueryInfoKey(key, 0, 0, 0, &idCount, 0, 0, 0, 0, 0, 0, 0) == ERROR_SUCCESS
            && idCount > 0) {
@ -311,7 +288,6 @@ QList<QByteArray> availableWindowsIds()
                    list.append(QString::fromWCharArray(buffer).toUtf8());
            }
        }
-        RegCloseKey(key);
    }
    return list;
 #else // QT_USE_REGISTRY_TIMEZONE
@ -325,15 +301,10 @@ QByteArray windowsSystemZoneId()
 {
 #ifdef QT_USE_REGISTRY_TIMEZONE
    // On Vista and later is held in the value TimeZoneKeyName in key currTzRegPath
-    QString id;
-    HKEY key = NULL;
-    QString tziKeyPath = QString::fromUtf8(currTzRegPath);
-    if (openRegistryKey(tziKeyPath, &key)) {
-        id = readRegistryString(key, L"TimeZoneKeyName");
-        RegCloseKey(key);
-        if (!id.isEmpty())
-            return std::move(id).toUtf8();
-    }
+    const QString id = QWinRegistryKey(HKEY_LOCAL_MACHINE, currTzRegPath)
+                       .stringValue(L"TimeZoneKeyName");
+    if (!id.isEmpty())
+        return id.toUtf8();

    // On XP we have to iterate over the zones until we find a match on
    // names/offsets with the current data
@ -575,22 +546,22 @@ void QWinTimeZonePrivate::init(const QByteArray &ianaId)
    if (!m_windowsId.isEmpty()) {
 #ifdef QT_USE_REGISTRY_TIMEZONE
        // Open the base TZI for the time zone
-        HKEY baseKey = NULL;
-        const QString baseKeyPath = QString::fromUtf8(tzRegPath) + QLatin1Char('\\')
+        const QString baseKeyPath = QString::fromWCharArray(tzRegPath) + QLatin1Char('\\')
                                   + QString::fromUtf8(m_windowsId);
-        if (openRegistryKey(baseKeyPath, &baseKey)) {
+        QWinRegistryKey baseKey(HKEY_LOCAL_MACHINE, baseKeyPath);
+        if (baseKey.isValid()) {
            //  Load the localized names
-            m_displayName = readRegistryString(baseKey, L"Display");
-            m_standardName = readRegistryString(baseKey, L"Std");
-            m_daylightName = readRegistryString(baseKey, L"Dlt");
+            m_displayName = baseKey.stringValue(L"Display");
+            m_standardName = baseKey.stringValue(L"Std");
+            m_daylightName = baseKey.stringValue(L"Dlt");
            // On Vista and later the optional dynamic key holds historic data
            const QString dynamicKeyPath = baseKeyPath + QLatin1String("\\Dynamic DST");
-            HKEY dynamicKey = NULL;
-            if (openRegistryKey(dynamicKeyPath, &dynamicKey)) {
+            QWinRegistryKey dynamicKey(HKEY_LOCAL_MACHINE, dynamicKeyPath);
+            if (dynamicKey.isValid()) {
                // Find out the start and end years stored, then iterate over them
-                int startYear = readRegistryValue(dynamicKey, L"FirstEntry");
-                int endYear = readRegistryValue(dynamicKey, L"LastEntry");
-                for (int year = startYear; year <= endYear; ++year) {
+                const auto startYear = dynamicKey.dwordValue(L"FirstEntry");
+                const auto endYear = dynamicKey.dwordValue(L"LastEntry");
+                for (int year = int(startYear.first); year <= int(endYear.first); ++year) {
                    bool ruleOk;
                    QWinTransitionRule rule = readRegistryRule(dynamicKey,
                                                               reinterpret_cast<LPCWSTR>(QString::number(year).utf16()),
@ -611,7 +582,6 @@ void QWinTimeZonePrivate::init(const QByteArray &ianaId)
                        m_tranRules.append(rule);
                    }
                }
-                RegCloseKey(dynamicKey);
            } else {
                // No dynamic data so use the base data
                bool ruleOk;
@ -620,7 +590,6 @@ void QWinTimeZonePrivate::init(const QByteArray &ianaId)
                if (ruleOk)
                    m_tranRules.append(rule);
            }
-            RegCloseKey(baseKey);
        }
 #else // QT_USE_REGISTRY_TIMEZONE
        if (gTimeZones->isEmpty())
--- a/src/gui/kernel/qtestsupport_gui.cpp
+++ b/src/gui/kernel/qtestsupport_gui.cpp
@ -37,10 +37,15 @@
 **
 ****************************************************************************/

+#include <private/qguiapplication_p.h>
+
+#include <qpa/qplatformintegration.h>
+
 #include "qtestsupport_gui.h"
 #include "qwindow.h"

 #include <QtCore/qtestsupport_core.h>
+#include <QtCore/QDebug>

 QT_BEGIN_NAMESPACE

@ -55,6 +60,14 @@ QT_BEGIN_NAMESPACE
 */
 Q_GUI_EXPORT bool QTest::qWaitForWindowActive(QWindow *window, int timeout)
 {
+    if (Q_UNLIKELY(!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))) {
+        qWarning() << "qWaitForWindowActive was called on a platform that doesn't support window"
+                   << "activation. This means there is an error in the test and it should either"
+                   << "check for the WindowActivation platform capability before calling"
+                   << "qWaitForWindowActivate, use qWaitForWindowExposed instead, or skip the test."
+                   << "Falling back to qWaitForWindowExposed.";
+        return qWaitForWindowExposed(window, timeout);
+    }
    return QTest::qWaitFor([&]() { return window->isActive(); }, timeout);
 }

--- a/src/gui/rhi/qrhigles2.cpp
+++ b/src/gui/rhi/qrhigles2.cpp
@ -525,6 +525,11 @@ void QRhiGles2::destroy()
    ensureContext();
    executeDeferredReleases();

+    if (vao) {
+        f->glDeleteVertexArrays(1, &vao);
+        vao = 0;
+    }
+
    for (uint shader : m_shaderCache)
        f->glDeleteShader(shader);
    m_shaderCache.clear();
@ -1151,6 +1156,13 @@ const QRhiNativeHandles *QRhiGles2::nativeHandles(QRhiCommandBuffer *cb)
    return nullptr;
 }

+static void addBoundaryCommand(QGles2CommandBuffer *cbD, QGles2CommandBuffer::Command::Cmd type)
+{
+    QGles2CommandBuffer::Command cmd;
+    cmd.cmd = type;
+    cbD->commands.append(cmd);
+}
+
 void QRhiGles2::beginExternal(QRhiCommandBuffer *cb)
 {
    if (ofr.active) {
@ -1166,6 +1178,9 @@ void QRhiGles2::beginExternal(QRhiCommandBuffer *cb)
    QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
    executeCommandBuffer(cbD);
    cbD->resetCommands();
+
+    if (vao)
+        f->glBindVertexArray(0);
 }

 void QRhiGles2::endExternal(QRhiCommandBuffer *cb)
@ -1183,17 +1198,12 @@ void QRhiGles2::endExternal(QRhiCommandBuffer *cb)
        enqueueBarriersForPass(cbD);
    }

+    addBoundaryCommand(cbD, QGles2CommandBuffer::Command::ResetFrame);
+
    if (cbD->currentTarget)
        enqueueBindFramebuffer(cbD->currentTarget, cbD);
 }

-static void addBoundaryCommand(QGles2CommandBuffer *cb, QGles2CommandBuffer::Command::Cmd type)
-{
-    QGles2CommandBuffer::Command cmd;
-    cmd.cmd = type;
-    cb->commands.append(cmd);
-}
-
 QRhi::FrameOpResult QRhiGles2::beginFrame(QRhiSwapChain *swapChain, QRhi::BeginFrameFlags flags)
 {
    Q_UNUSED(flags);
@ -1913,6 +1923,10 @@ void QRhiGles2::executeCommandBuffer(QRhiCommandBuffer *cb)
            if (vao)
                f->glBindVertexArray(0);
            break;
+        case QGles2CommandBuffer::Command::ResetFrame:
+            if (vao)
+                f->glBindVertexArray(vao);
+            break;
        case QGles2CommandBuffer::Command::Viewport:
            f->glViewport(GLint(cmd.args.viewport.x), GLint(cmd.args.viewport.y), GLsizei(cmd.args.viewport.w), GLsizei(cmd.args.viewport.h));
            f->glDepthRangef(cmd.args.viewport.d0, cmd.args.viewport.d1);
--- a/src/gui/rhi/qrhigles2_p_p.h
+++ b/src/gui/rhi/qrhigles2_p_p.h
@ -300,6 +300,7 @@ struct QGles2CommandBuffer : public QRhiCommandBuffer
        enum Cmd {
            BeginFrame,
            EndFrame,
+            ResetFrame,
            Viewport,
            Scissor,
            BlendConstants,
--- a/src/network/bearer/bearer.pri
+++ b/src/network/bearer/bearer.pri
@ -6,11 +6,14 @@ HEADERS += bearer/qnetworkconfiguration.h \
           bearer/qnetworkconfigmanager_p.h \
           bearer/qnetworkconfiguration_p.h \
           bearer/qnetworksession_p.h \
+           bearer/qnetworksession_impl_p.h \
           bearer/qbearerengine_p.h \
+           bearer/qbearerengine_impl_p.h \
           bearer/qbearerplugin_p.h \
           bearer/qsharednetworksession_p.h

 SOURCES += bearer/qnetworksession.cpp \
+           bearer/qnetworksession_impl.cpp \
           bearer/qnetworkconfigmanager.cpp \
           bearer/qnetworkconfiguration.cpp \
           bearer/qnetworkconfigmanager_p.cpp \
--- a/src/network/bearer/qbearerengine_impl_p.h
+++ b/src/network/bearer/qbearerengine_impl_p.h
@ -42,9 +42,11 @@

 #include <QtNetwork/private/qbearerengine_p.h>

+#ifndef QT_NO_BEARERMANAGEMENT
+
 QT_BEGIN_NAMESPACE

-class QBearerEngineImpl : public QBearerEngine
+class Q_NETWORK_EXPORT QBearerEngineImpl : public QBearerEngine
 {
    Q_OBJECT

@ -78,4 +80,6 @@ QT_END_NAMESPACE

 Q_DECLARE_METATYPE(QBearerEngineImpl::ConnectionError)

+#endif // QT_NO_BEARERMANAGEMENT
+
 #endif // QBEARERENGINE_IMPL_H
--- a/src/network/bearer/qnetworksession_impl.cpp
+++ b/src/network/bearer/qnetworksession_impl.cpp
@ -40,8 +40,8 @@
 // see comment in ../platformdefs_win.h.
 #define WIN32_LEAN_AND_MEAN 1

-#include "qnetworksession_impl.h"
-#include "qbearerengine_impl.h"
+#include "qnetworksession_impl_p.h"
+#include "qbearerengine_impl_p.h"

 #include <QtNetwork/qnetworksession.h>
 #include <QtNetwork/private/qnetworkconfigmanager_p.h>
@ -51,6 +51,8 @@
 #include <QtCore/qmutex.h>
 #include <QtCore/qstringlist.h>

+#ifndef QT_NO_BEARERMANAGEMENT
+
 QT_BEGIN_NAMESPACE

 static QBearerEngineImpl *getEngineFromId(const QString &id)
@ -433,3 +435,5 @@ void QNetworkSessionPrivateImpl::decrementTimeout()
 QT_END_NAMESPACE

 #include "qnetworksession_impl.moc"
+
+#endif // QT_NO_BEARERMANAGEMENT
--- a/src/network/bearer/qnetworksession_impl_p.h
+++ b/src/network/bearer/qnetworksession_impl_p.h
@ -51,16 +51,18 @@
 // We mean it.
 //

-#include "qbearerengine_impl.h"
+#include "qbearerengine_impl_p.h"

 #include <QtNetwork/private/qnetworkconfigmanager_p.h>
 #include <QtNetwork/private/qnetworksession_p.h>

+#ifndef QT_NO_BEARERMANAGEMENT
+
 QT_BEGIN_NAMESPACE

 class QBearerEngineImpl;

-class QNetworkSessionPrivateImpl : public QNetworkSessionPrivate
+class Q_NETWORK_EXPORT QNetworkSessionPrivateImpl : public QNetworkSessionPrivate
 {
    Q_OBJECT

@ -127,4 +129,6 @@ private:

 QT_END_NAMESPACE

+#endif // QT_NO_BEARERMANAGEMENT
+
 #endif // QNETWORKSESSION_IMPL_H
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@ -432,88 +432,142 @@ template class QCoreTextFontDatabaseEngineFactory<QCoreTextFontEngine>;
 template class QCoreTextFontDatabaseEngineFactory<QFontEngineFT>;
 #endif

-QStringList QCoreTextFontDatabase::fallbacksForFamily(const QString &family)
+CTFontDescriptorRef descriptorForFamily(const QString &familyName)
+{
+    return CTFontDescriptorCreateWithAttributes(CFDictionaryRef(@{
+        (id)kCTFontFamilyNameAttribute: familyName.toNSString()
+    }));
+}
+
+CTFontDescriptorRef descriptorForFamily(const char *familyName)
+{
+    return descriptorForFamily(QString::fromLatin1(familyName));
+}
+
+CFArrayRef fallbacksForDescriptor(CTFontDescriptorRef descriptor)
+{
+    QCFType<CTFontRef> font = CTFontCreateWithFontDescriptor(descriptor, 0.0, nullptr);
+    if (!font) {
+        qCWarning(lcQpaFonts) << "Failed to create fallback font for" << descriptor;
+        return nullptr;
+    }
+
+    CFArrayRef cascadeList = CFArrayRef(CTFontCopyDefaultCascadeListForLanguages(font,
+        (CFArrayRef)[NSUserDefaults.standardUserDefaults stringArrayForKey:@"AppleLanguages"]));
+
+    if (!cascadeList) {
+        qCWarning(lcQpaFonts) << "Failed to create fallback cascade list for" << descriptor;
+        return nullptr;
+    }
+
+    return cascadeList;
+}
+
+CFArrayRef QCoreTextFontDatabase::fallbacksForFamily(const QString &family)
 {
    if (family.isEmpty())
-        return QStringList();
+        return nullptr;

-    auto attributes = @{ id(kCTFontFamilyNameAttribute): family.toNSString() };
-    QCFType<CTFontDescriptorRef> fontDescriptor = CTFontDescriptorCreateWithAttributes(CFDictionaryRef(attributes));
+    QCFType<CTFontDescriptorRef> fontDescriptor = descriptorForFamily(family);
    if (!fontDescriptor) {
        qCWarning(lcQpaFonts) << "Failed to create fallback font descriptor for" << family;
-        return QStringList();
+        return nullptr;
    }

-    QCFType<CTFontRef> font = CTFontCreateWithFontDescriptor(fontDescriptor, 12.0, 0);
-    if (!font) {
-        qCWarning(lcQpaFonts) << "Failed to create fallback font for" << family;
-        return QStringList();
-    }
+    // If the font is not available we want to fall back to the style hint.
+    // By creating a matching font descriptor we can verify whether the font
+    // is available or not, and avoid CTFontCreateWithFontDescriptor picking
+    // a default font for us based on incomplete information.
+    fontDescriptor = CTFontDescriptorCreateMatchingFontDescriptor(fontDescriptor, 0);
+    if (!fontDescriptor)
+        return nullptr;

-    QCFType<CFArrayRef> cascadeList = CFArrayRef(CTFontCopyDefaultCascadeListForLanguages(font,
-        (CFArrayRef)[NSUserDefaults.standardUserDefaults stringArrayForKey:@"AppleLanguages"]));
-    if (!cascadeList) {
-        qCWarning(lcQpaFonts) << "Failed to create fallback cascade list for" << family;
-        return QStringList();
-    }
+    return fallbacksForDescriptor(fontDescriptor);
+}

-    QStringList fallbackList;
-    const int numCascades = CFArrayGetCount(cascadeList);
-    for (int i = 0; i < numCascades; ++i) {
-        CTFontDescriptorRef fontFallback = CTFontDescriptorRef(CFArrayGetValueAtIndex(cascadeList, i));
-        QCFString fallbackFamilyName = CFStringRef(CTFontDescriptorCopyAttribute(fontFallback, kCTFontFamilyNameAttribute));
-        fallbackList.append(QString::fromCFString(fallbackFamilyName));
-    }
+CTFontDescriptorRef descriptorForFontType(CTFontUIFontType uiType)
+{
+    static const CGFloat kDefaultSizeForRequestedUIType = 0.0;
+    QCFType<CTFontRef> ctFont = CTFontCreateUIFontForLanguage(
+        uiType, kDefaultSizeForRequestedUIType, nullptr);
+    return CTFontCopyFontDescriptor(ctFont);
+}

-    return fallbackList;
+CTFontDescriptorRef descriptorForStyle(QFont::StyleHint styleHint)
+{
+    switch (styleHint) {
+        case QFont::SansSerif: return descriptorForFamily("Helvetica");
+        case QFont::Serif: return descriptorForFamily("Times New Roman");
+        case QFont::Monospace: return descriptorForFamily("Menlo");
+#ifdef Q_OS_MACOS
+        case QFont::Cursive: return descriptorForFamily("Apple Chancery");
+#endif
+        case QFont::Fantasy: return descriptorForFamily("Zapfino");
+        case QFont::TypeWriter: return descriptorForFamily("American Typewriter");
+        case QFont::AnyStyle: Q_FALLTHROUGH();
+        case QFont::System: return descriptorForFontType(kCTFontUIFontSystem);
+        default: return nullptr; // No matching font on this platform
+    }
 }

 QStringList QCoreTextFontDatabase::fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const
 {
    Q_UNUSED(style);

+    qCDebug(lcQpaFonts).nospace() << "Resolving fallbacks families for"
+        << (!family.isEmpty() ? qPrintable(QLatin1String(" family '%1' with").arg(family)) : "")
+        << " style hint " << styleHint;
+
    QMacAutoReleasePool pool;

-    QStringList fallbackList = fallbacksForFamily(family);
+    QStringList fallbackList;

-    if (fallbackList.isEmpty()) {
+    QCFType<CFArrayRef> fallbackFonts = fallbacksForFamily(family);
+    if (!fallbackFonts || !CFArrayGetCount(fallbackFonts)) {
        // We were not able to find a fallback for the specific family,
        // or the family was empty, so we fall back to the style hint.
-        QString styleFamily = [styleHint]{
-            switch (styleHint) {
-                case QFont::SansSerif: return QStringLiteral("Helvetica");
-                case QFont::Serif: return QStringLiteral("Times New Roman");
-                case QFont::Monospace: return QStringLiteral("Menlo");
-#ifdef Q_OS_MACOS
-                case QFont::Cursive: return QStringLiteral("Apple Chancery");
-#endif
-                case QFont::Fantasy: return QStringLiteral("Zapfino");
-                case QFont::TypeWriter: return QStringLiteral("American Typewriter");
-                case QFont::AnyStyle: Q_FALLTHROUGH();
-                case QFont::System: {
-                    QCFType<CTFontRef> font = CTFontCreateUIFontForLanguage(kCTFontUIFontSystem, 12.0, NULL);
-                    return static_cast<QString>(QCFString(CTFontCopyFullName(font)));
-                }
-                default: return QString(); // No matching font on this platform
-            }
-        }();
-        if (!styleFamily.isEmpty()) {
-            fallbackList = fallbacksForFamily(styleFamily);
-            if (!fallbackList.contains(styleFamily))
-                fallbackList.prepend(styleFamily);
+        if (!family.isEmpty())
+            qCDebug(lcQpaFonts) << "No fallbacks found. Using style hint instead";
+
+        if (QCFType<CTFontDescriptorRef> styleDescriptor = descriptorForStyle(styleHint)) {
+            CFMutableArrayRef tmp = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks);
+            CFArrayAppendValue(tmp, styleDescriptor);
+            QCFType<CFArrayRef> styleFallbacks = fallbacksForDescriptor(styleDescriptor);
+            CFArrayAppendArray(tmp, styleFallbacks, CFRangeMake(0, CFArrayGetCount(styleFallbacks)));
+            fallbackFonts = tmp;
        }
    }

-    if (fallbackList.isEmpty())
+    if (!fallbackFonts)
        return fallbackList;

-    // .Apple Symbols Fallback will be at the beginning of the list and we will
-    // detect that this has glyphs for Arabic and other writing systems.
-    // Since it is a symbol font, it should be the last resort, so that
-    // the proper fonts for these writing systems are preferred.
-    int symbolIndex = fallbackList.indexOf(QLatin1String(".Apple Symbols Fallback"));
-    if (symbolIndex >= 0)
-        fallbackList.move(symbolIndex, fallbackList.size() - 1);
+    const int numberOfFallbacks = CFArrayGetCount(fallbackFonts);
+    for (int i = 0; i < numberOfFallbacks; ++i) {
+        auto fallbackDescriptor = CTFontDescriptorRef(CFArrayGetValueAtIndex(fallbackFonts, i));
+        auto fallbackFamilyName = QCFString(CTFontDescriptorCopyAttribute(fallbackDescriptor, kCTFontFamilyNameAttribute));
+
+        if (!isFamilyPopulated(fallbackFamilyName)) {
+            // We need to populate, or at least register the fallback fonts,
+            // otherwise the Qt font database may not know they exist.
+            if (isPrivateFontFamily(fallbackFamilyName))
+                const_cast<QCoreTextFontDatabase *>(this)->populateFromDescriptor(fallbackDescriptor);
+            else
+                registerFontFamily(fallbackFamilyName);
+        }
+
+        fallbackList.append(fallbackFamilyName);
+    }
+
+    // Some fallback fonts will have have an order in the list returned
+    // by Core Text that would indicate they should be preferred for e.g.
+    // Arabic, or Emoji, while in reality only supporting a tiny subset
+    // of the required glyphs, or representing them by question marks.
+    // Move these to the end, so that the proper fonts are preferred.
+    for (const char *family : { ".Apple Symbols Fallback", ".Noto Sans Universal" }) {
+        int index = fallbackList.indexOf(QLatin1String(family));
+        if (index >= 0)
+            fallbackList.move(index, fallbackList.size() - 1);
+    }

 #if defined(Q_OS_MACOS)
    // Since we are only returning a list of default fonts for the current language, we do not
@ -529,18 +583,11 @@ QStringList QCoreTextFontDatabase::fallbacksForFamily(const QString &family, QFo
        fallbackList.append(QStringLiteral("Apple Symbols"));
 #endif

-    // Since iOS 13, the cascade list may contain meta-fonts which have not been
-    // populated to the database, such as ".AppleJapaneseFont". It is important that we
-    // include this in the fallback list, in order to get fallback support for all
-    // languages
-    for (const QString &fallback : fallbackList) {
-        if (!QPlatformFontDatabase::isFamilyPopulated(fallback))
-            const_cast<QCoreTextFontDatabase *>(this)->populateFamily(fallback);
-    }
-
    extern QStringList qt_sort_families_by_writing_system(QChar::Script, const QStringList &);
    fallbackList = qt_sort_families_by_writing_system(script, fallbackList);

+    qCDebug(lcQpaFonts).nospace() << "Fallback families ordered by script " << script << ": " << fallbackList;
+
    return fallbackList;
 }

@ -700,10 +747,8 @@ static CTFontDescriptorRef fontDescriptorFromTheme(QPlatformTheme::Font f)
    }
 #endif // Q_OS_IOS, Q_OS_TVOS, Q_OS_WATCHOS

-    // OSX default case and iOS fallback case
-    CTFontUIFontType fontType = fontTypeFromTheme(f);
-    QCFType<CTFontRef> ctFont = CTFontCreateUIFontForLanguage(fontType, 0.0, NULL);
-    return CTFontCopyFontDescriptor(ctFont);
+    // macOS default case and iOS fallback case
+    return descriptorForFontType(fontTypeFromTheme(f));
 }

 const QHash<QPlatformTheme::Font, QFont *> &QCoreTextFontDatabase::themeFonts() const
@ -736,8 +781,8 @@ QFont *QCoreTextFontDatabase::themeFont(QPlatformTheme::Font f) const
 QFont QCoreTextFontDatabase::defaultFont() const
 {
    if (defaultFontName.isEmpty()) {
-        QCFType<CTFontRef> font = CTFontCreateUIFontForLanguage(kCTFontUIFontSystem, 12.0, NULL);
-        defaultFontName = (QString) QCFString(CTFontCopyFullName(font));
+        QCFType<CTFontDescriptorRef> systemFont = descriptorForFontType(kCTFontUIFontSystem);
+        defaultFontName = QCFString(CTFontDescriptorCopyAttribute(systemFont, kCTFontFamilyNameAttribute));
    }

    return QFont(defaultFontName);
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
@ -92,7 +92,7 @@ protected:

 private:
    void populateFromDescriptor(CTFontDescriptorRef font, const QString &familyName = QString());
-    static QStringList fallbacksForFamily(const QString &family);
+    static CFArrayRef fallbacksForFamily(const QString &family);

    mutable QString defaultFontName;

--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
@ -53,6 +53,7 @@
 #include <QtCore/QtEndian>
 #include <QtCore/QThreadStorage>
 #include <QtCore/private/qsystemlibrary_p.h>
+#include <QtCore/private/qwinregistry_p.h>

 #include <wchar.h>

@ -1210,33 +1211,8 @@ static int QT_WIN_CALLBACK populateFontFamilies(const LOGFONT *logFont, const TE

 void QWindowsFontDatabase::addDefaultEUDCFont()
 {
-    QString path;
-    {
-        HKEY key;
-        if (RegOpenKeyEx(HKEY_CURRENT_USER,
-                         L"EUDC\\1252",
-                         0,
-                         KEY_READ,
-                         &key) != ERROR_SUCCESS) {
-            return;
-        }
-
-        WCHAR value[MAX_PATH];
-        DWORD bufferSize = sizeof(value);
-        ZeroMemory(value, bufferSize);
-
-        if (RegQueryValueEx(key,
-                            L"SystemDefaultEUDCFont",
-                            nullptr,
-                            nullptr,
-                            reinterpret_cast<LPBYTE>(value),
-                            &bufferSize) == ERROR_SUCCESS) {
-            path = QString::fromWCharArray(value);
-        }
-
-        RegCloseKey(key);
-    }
-
+    const QString path = QWinRegistryKey(HKEY_CURRENT_USER, LR"(EUDC\1252)")
+                         .stringValue(L"SystemDefaultEUDCFont");
    if (!path.isEmpty()) {
        QFile file(path);
        if (!file.open(QIODevice::ReadOnly)) {
@ -2105,28 +2081,6 @@ int QWindowsFontDatabase::defaultVerticalDPI()
    return vDPI;
 }

-QString QWindowsFontDatabase::readRegistryString(HKEY parentHandle, const wchar_t *keyPath, const wchar_t *keyName)
-{
-    QString result;
-    HKEY handle = 0;
-    if (RegOpenKeyEx(parentHandle, keyPath, 0, KEY_READ, &handle) == ERROR_SUCCESS) {
-        // get the size and type of the value
-        DWORD dataType;
-        DWORD dataSize;
-        if (RegQueryValueEx(handle, keyName, 0, &dataType, 0, &dataSize) == ERROR_SUCCESS) {
-            if (dataType == REG_SZ || dataType == REG_EXPAND_SZ) {
-                dataSize += 2; // '\0' missing?
-                QVarLengthArray<unsigned char> data(dataSize);
-                data[dataSize - 2] = data[dataSize - 1] = '\0';
-                if (RegQueryValueEx(handle, keyName, 0, 0, data.data(), &dataSize) == ERROR_SUCCESS)
-                    result = QString::fromWCharArray(reinterpret_cast<const wchar_t *>(data.data()));
-            }
-        }
-        RegCloseKey(handle);
-    }
-    return result;
-}
-
 bool QWindowsFontDatabase::isPrivateFontFamily(const QString &family) const
 {
    return m_eudcFonts.contains(family) || QPlatformFontDatabase::isPrivateFontFamily(family);
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
@ -133,8 +133,6 @@ public:
    static void setFontOptions(unsigned options);
    static unsigned fontOptions();

-    static QString readRegistryString(HKEY parentHandle, const wchar_t *keyPath, const wchar_t *keyName);
-
 private:
    void removeApplicationFonts();
    void addDefaultEUDCFont();
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
@ -47,6 +47,7 @@
 #include <QtCore/QFile>
 #include <private/qstringiterator_p.h>
 #include <QtCore/private/qsystemlibrary_p.h>
+#include <QtCore/private/qwinregistry_p.h>
 #include <QtGui/private/qguiapplication_p.h>
 #include <qpa/qplatformintegration.h>
 #include <QtGui/private/qhighdpiscaling_p.h>
@ -945,10 +946,10 @@ void QWindowsFontEngineDirectWrite::initFontInfo(const QFontDef &request,

 QString QWindowsFontEngineDirectWrite::fontNameSubstitute(const QString &familyName)
 {
-    const wchar_t key[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes";
    const QString substitute =
-        QWindowsFontDatabase::readRegistryString(HKEY_LOCAL_MACHINE, key,
-                                                 reinterpret_cast<const wchar_t *>(familyName.utf16()));
+        QWinRegistryKey(HKEY_LOCAL_MACHINE,
+                        LR"(Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes)")
+        .stringValue(familyName);
    return substitute.isEmpty() ? familyName : substitute;
 }

--- a/src/plugins/bearer/android/src/qandroidbearerengine.cpp
+++ b/src/plugins/bearer/android/src/qandroidbearerengine.cpp
@ -38,7 +38,7 @@
 ****************************************************************************/

 #include "qandroidbearerengine.h"
-#include "../../qnetworksession_impl.h"
+#include <private/qnetworksession_impl_p.h>
 #include "wrappers/androidconnectivitymanager.h"

 #ifndef QT_NO_BEARERMANAGEMENT
--- a/src/plugins/bearer/android/src/qandroidbearerengine.h
+++ b/src/plugins/bearer/android/src/qandroidbearerengine.h
@ -40,7 +40,7 @@
 #ifndef QANDROIDBEARERENGINE_H
 #define QANDROIDBEARERENGINE_H

-#include "../../qbearerengine_impl.h"
+#include <private/qbearerengine_impl_p.h>

 #include <QAbstractEventDispatcher>
 #include <QAbstractNativeEventFilter>
--- a/src/plugins/bearer/android/src/src.pro
+++ b/src/plugins/bearer/android/src/src.pro
@ -2,13 +2,10 @@ TARGET = qandroidbearer

 QT = core-private network-private

-HEADERS += qandroidbearerengine.h \
-           ../../qnetworksession_impl.h \
-           ../../qbearerengine_impl.h
+HEADERS += qandroidbearerengine.h

 SOURCES += main.cpp \
-           qandroidbearerengine.cpp \
-           ../../qnetworksession_impl.cpp
+           qandroidbearerengine.cpp

 include(wrappers/wrappers.pri)

--- a/src/plugins/bearer/connman/connman.pro
+++ b/src/plugins/bearer/connman/connman.pro
@ -4,15 +4,12 @@ QT = core network-private dbus

 HEADERS += qconnmanservice_linux_p.h \
           ../linux_common/qofonoservice_linux_p.h \
-           qconnmanengine.h \
-           ../qnetworksession_impl.h \
-           ../qbearerengine_impl.h
+           qconnmanengine.h

 SOURCES += main.cpp \
           qconnmanservice_linux.cpp \
           ../linux_common/qofonoservice_linux.cpp \
-           qconnmanengine.cpp \
-           ../qnetworksession_impl.cpp
+           qconnmanengine.cpp

 OTHER_FILES += connman.json

--- a/src/plugins/bearer/connman/qconnmanengine.cpp
+++ b/src/plugins/bearer/connman/qconnmanengine.cpp
@ -39,7 +39,7 @@

 #include "qconnmanengine.h"
 #include "qconnmanservice_linux_p.h"
-#include "../qnetworksession_impl.h"
+#include <private/qnetworksession_impl_p.h>

 #include <QtNetwork/private/qnetworkconfiguration_p.h>

--- a/src/plugins/bearer/connman/qconnmanengine.h
+++ b/src/plugins/bearer/connman/qconnmanengine.h
@ -51,7 +51,7 @@
 // We mean it.
 //

-#include "../qbearerengine_impl.h"
+#include <private/qbearerengine_impl_p.h>

 #include "qconnmanservice_linux_p.h"
 #include "../linux_common/qofonoservice_linux_p.h"
--- a/src/plugins/bearer/corewlan/corewlan.pro
+++ b/src/plugins/bearer/corewlan/corewlan.pro
@ -7,12 +7,9 @@ qtConfig(corewlan) {
    LIBS += -framework CoreWLAN -framework Security
 }

-HEADERS += qcorewlanengine.h \
-           ../qnetworksession_impl.h \
-           ../qbearerengine_impl.h
+HEADERS += qcorewlanengine.h

-SOURCES += main.cpp \
-           ../qnetworksession_impl.cpp
+SOURCES += main.cpp

 OBJECTIVE_SOURCES += qcorewlanengine.mm

--- a/src/plugins/bearer/corewlan/qcorewlanengine.h
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.h
@ -40,7 +40,7 @@
 #ifndef QCOREWLANENGINE_H
 #define QCOREWLANENGINE_H

-#include "../qbearerengine_impl.h"
+#include <private/qbearerengine_impl_p.h>

 #include <QMap>
 #include <QTimer>
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
@ -38,7 +38,7 @@
 ****************************************************************************/

 #include "qcorewlanengine.h"
-#include "../qnetworksession_impl.h"
+#include <private/qnetworksession_impl_p.h>

 #include <QtNetwork/private/qnetworkconfiguration_p.h>

@ -62,12 +62,11 @@ extern "C" { // Otherwise it won't find CWKeychain* symbols at link time
 #include <ifaddrs.h>

@interface QT_MANGLE_NAMESPACE(QNSListener) : NSObject <CWEventDelegate>
-
@property (assign) QCoreWlanEngine* engine;
-
@end
+QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSListener);

-@implementation QT_MANGLE_NAMESPACE(QNSListener) {
+@implementation QNSListener {
    NSNotificationCenter *notificationCenter;
    CWWiFiClient *client;
    QCoreWlanEngine *engine;
@ -88,7 +87,7 @@ extern "C" { // Otherwise it won't find CWKeychain* symbols at link time
    return self;
 }

-static QT_MANGLE_NAMESPACE(QNSListener) *listener = 0;
+static QNSListener *listener = 0;

 -(void)dealloc
 {
@ -415,7 +414,7 @@ void QCoreWlanEngine::initialize()
    QMacAutoReleasePool pool;

    if ([[CWWiFiClient interfaceNames] count] > 0 && !listener) {
-        listener = [[QT_MANGLE_NAMESPACE(QNSListener) alloc] init];
+        listener = [QNSListener alloc] init];
        listener.engine = this;
        hasWifi = true;
    } else {
--- a/src/plugins/bearer/generic/generic.pro
+++ b/src/plugins/bearer/generic/generic.pro
@ -3,11 +3,8 @@ TARGET = qgenericbearer
 QT = core-private network-private

 HEADERS += qgenericengine.h \
-           ../qnetworksession_impl.h \
-           ../qbearerengine_impl.h \
           ../platformdefs_win.h
 SOURCES += qgenericengine.cpp \
-           ../qnetworksession_impl.cpp \
           main.cpp

 OTHER_FILES += generic.json
--- a/src/plugins/bearer/generic/qgenericengine.cpp
+++ b/src/plugins/bearer/generic/qgenericengine.cpp
@ -41,7 +41,7 @@
 #define WIN32_LEAN_AND_MEAN 1

 #include "qgenericengine.h"
-#include "../qnetworksession_impl.h"
+#include <private/qnetworksession_impl_p.h>

 #include <QtNetwork/private/qnetworkconfiguration_p.h>

--- a/src/plugins/bearer/generic/qgenericengine.h
+++ b/src/plugins/bearer/generic/qgenericengine.h
@ -40,7 +40,7 @@
 #ifndef QGENERICENGINE_H
 #define QGENERICENGINE_H

-#include "../qbearerengine_impl.h"
+#include <private/qbearerengine_impl_p.h>

 #include <QMap>
 #include <QTimer>
--- a/src/plugins/bearer/nativewifi/nativewifi.pro
+++ b/src/plugins/bearer/nativewifi/nativewifi.pro
@ -3,13 +3,10 @@ TARGET = qnativewifibearer
 QT = core-private network-private

 HEADERS += qnativewifiengine.h \
-           platformdefs.h \
-           ../qnetworksession_impl.h \
-           ../qbearerengine_impl.h
+           platformdefs.h

 SOURCES += main.cpp \
-           qnativewifiengine.cpp \
-           ../qnetworksession_impl.cpp
+           qnativewifiengine.cpp

 OTHER_FILES += nativewifi.json

--- a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp
+++ b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp
@ -39,7 +39,7 @@

 #include "qnativewifiengine.h"
 #include "platformdefs.h"
-#include "../qnetworksession_impl.h"
+#include <private/qnetworksession_impl_p.h>

 #include <QtNetwork/private/qnetworkconfiguration_p.h>

--- a/src/plugins/bearer/nativewifi/qnativewifiengine.h
+++ b/src/plugins/bearer/nativewifi/qnativewifiengine.h
@ -51,7 +51,7 @@
 // We mean it.
 //

-#include "../qbearerengine_impl.h"
+#include <private/qbearerengine_impl_p.h>

 #include <QtCore/qtimer.h>

--- a/src/plugins/bearer/networkmanager/networkmanager.pro
+++ b/src/plugins/bearer/networkmanager/networkmanager.pro
@ -4,15 +4,12 @@ QT = core network-private dbus

 HEADERS += qnetworkmanagerservice.h \
           qnetworkmanagerengine.h \
-           ../linux_common/qofonoservice_linux_p.h \
-           ../qnetworksession_impl.h \
-           ../qbearerengine_impl.h
+           ../linux_common/qofonoservice_linux_p.h

 SOURCES += main.cpp \
           qnetworkmanagerservice.cpp \
           qnetworkmanagerengine.cpp \
-           ../linux_common/qofonoservice_linux.cpp \
-           ../qnetworksession_impl.cpp
+           ../linux_common/qofonoservice_linux.cpp

 OTHER_FILES += networkmanager.json

--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
@ -39,7 +39,7 @@

 #include "qnetworkmanagerengine.h"
 #include "qnetworkmanagerservice.h"
-#include "../qnetworksession_impl.h"
+#include <private/qnetworksession_impl_p.h>

 #include <QtNetwork/private/qnetworkconfiguration_p.h>

--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
@ -51,7 +51,7 @@
 // We mean it.
 //

-#include "../qbearerengine_impl.h"
+#include <private/qbearerengine_impl_p.h>

 #include "qnetworkmanagerservice.h"

--- a/src/plugins/bearer/nla/nla.pro
+++ b/src/plugins/bearer/nla/nla.pro
@ -5,13 +5,10 @@ QT = core core-private network network-private
 QMAKE_USE_PRIVATE += ws2_32

 HEADERS += qnlaengine.h \
-           ../platformdefs_win.h \
-           ../qnetworksession_impl.h \
-           ../qbearerengine_impl.h
+           ../platformdefs_win.h

 SOURCES += main.cpp \
-           qnlaengine.cpp \
-           ../qnetworksession_impl.cpp
+           qnlaengine.cpp

 OTHER_FILES += nla.json

--- a/src/plugins/bearer/nla/qnlaengine.cpp
+++ b/src/plugins/bearer/nla/qnlaengine.cpp
@ -38,7 +38,7 @@
 ****************************************************************************/

 #include "qnlaengine.h"
-#include "../qnetworksession_impl.h"
+#include <private/qnetworksession_impl_p.h>

 #include <QtNetwork/private/qnetworkconfiguration_p.h>

--- a/src/plugins/bearer/nla/qnlaengine.h
+++ b/src/plugins/bearer/nla/qnlaengine.h
@ -51,7 +51,7 @@
 // We mean it.
 //

-#include "../qbearerengine_impl.h"
+#include <private/qbearerengine_impl_p.h>

 #include <QtNetwork/private/qnativesocketengine_p.h>

--- a/src/plugins/platforms/android/android.pro
+++ b/src/plugins/platforms/android/android.pro
@ -16,7 +16,6 @@ INCLUDEPATH += \
    $$QT_SOURCE_TREE/src/3rdparty/android

 SOURCES += $$PWD/main.cpp \
-           $$PWD/androidplatformplugin.cpp \
           $$PWD/androidcontentfileengine.cpp \
           $$PWD/androiddeadlockprotector.cpp \
           $$PWD/androidjnimain.cpp \
--- a/src/plugins/platforms/android/main.cpp
+++ b/src/plugins/platforms/android/main.cpp
@ -61,3 +61,4 @@ QPlatformIntegration *QAndroidIntegrationPlugin::create(const QString& system, c
 }

 QT_END_NAMESPACE
+#include "main.moc"
--- a/src/plugins/platforms/cocoa/qcocoaaccessibility.h
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibility.h
@ -44,9 +44,9 @@
 #include <QtGui>
 #include <qpa/qplatformaccessibility.h>

-#ifndef QT_NO_ACCESSIBILITY
+#include "qcocoaaccessibilityelement.h"

-@class QT_MANGLE_NAMESPACE(QMacAccessibilityElement);
+#ifndef QT_NO_ACCESSIBILITY

 QT_BEGIN_NAMESPACE

@ -84,7 +84,7 @@ namespace QCocoaAccessible {
 NSString *macRole(QAccessibleInterface *interface);
 NSString *macSubrole(QAccessibleInterface *interface);
 bool shouldBeIgnored(QAccessibleInterface *interface);
-NSArray<QT_MANGLE_NAMESPACE(QMacAccessibilityElement) *> *unignoredChildren(QAccessibleInterface *interface);
+NSArray<QMacAccessibilityElement *> *unignoredChildren(QAccessibleInterface *interface);
 NSString *getTranslatedAction(const QString &qtAction);
 QString translateAction(NSString *nsAction, QAccessibleInterface *interface);
 bool hasValueAttribute(QAccessibleInterface *interface);
--- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
@ -50,8 +50,6 @@

 #import <qaccessible.h>

-@class QT_MANGLE_NAMESPACE(QMacAccessibilityElement);
-
@interface QT_MANGLE_NAMESPACE(QMacAccessibilityElement) : NSObject <NSAccessibilityElement>

 - (instancetype)initWithId:(QAccessible::Id)anId;
--- a/src/plugins/platforms/cocoa/qcocoaapplication.mm
+++ b/src/plugins/platforms/cocoa/qcocoaapplication.mm
@ -144,7 +144,7 @@ static void qt_maybeSendKeyEquivalentUpEvent(NSEvent *event)
    }
 }

-@implementation QT_MANGLE_NAMESPACE(QNSApplication)
+@implementation QNSApplication

 - (void)QT_MANGLE_NAMESPACE(qt_sendEvent_original):(NSEvent *)event
 {
@ -188,7 +188,7 @@ void qt_redirectNSApplicationSendEvent()
        // can be unloaded.
        return;

-    if ([NSApp isMemberOfClass:[QT_MANGLE_NAMESPACE(QNSApplication) class]]) {
+    if ([NSApp isMemberOfClass:[QNSApplication class]]) {
        // No need to change implementation since Qt
        // already controls a subclass of NSApplication
        return;
@ -201,7 +201,7 @@ void qt_redirectNSApplicationSendEvent()
    qt_cocoa_change_implementation(
            [NSApplication class],
            @selector(sendEvent:),
-            [QT_MANGLE_NAMESPACE(QNSApplication) class],
+            [QNSApplication class],
            @selector(QT_MANGLE_NAMESPACE(qt_sendEvent_replacement):),
            @selector(QT_MANGLE_NAMESPACE(qt_sendEvent_original):));
 }
--- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.h
+++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.h
@ -89,8 +89,7 @@

 #include <qglobal.h>
 #include <private/qcore_mac_p.h>
-
-Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QCocoaNSMenuItem));
+#include "qcocoansmenu.h"

@interface QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) : NSObject <NSApplicationDelegate>
@property (nonatomic, retain) NSMenu *dockMenu;
@ -100,8 +99,9 @@ Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QCocoaNSMenuItem));
 - (bool)inLaunch;
@end

-@interface QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) (MenuAPI)
- (void)qt_itemFired:(QT_MANGLE_NAMESPACE(QCocoaNSMenuItem) *)item;
+QT_NAMESPACE_ALIAS_OBJC_CLASS(QCocoaApplicationDelegate);
+
+@interface QCocoaApplicationDelegate (MenuAPI)
+- (void)qt_itemFired:(QCocoaNSMenuItem *)item;
@end

-QT_NAMESPACE_ALIAS_OBJC_CLASS(QCocoaApplicationDelegate);
--- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
+++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
@ -145,7 +145,7 @@ QT_USE_NAMESPACE
    [[NSApp mainMenu] cancelTracking];

    bool handle_quit = true;
-    NSMenuItem *quitMenuItem = [[QT_MANGLE_NAMESPACE(QCocoaMenuLoader) sharedMenuLoader] quitMenuItem];
+    NSMenuItem *quitMenuItem = [[QCocoaMenuLoader sharedMenuLoader] quitMenuItem];
    if (!QGuiApplicationPrivate::instance()->modalWindowList.isEmpty()
        && [quitMenuItem isEnabled]) {
        int visible = 0;
--- a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
+++ b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
@ -293,7 +293,7 @@ class QCocoaColorPanel
 public:
    QCocoaColorPanel()
    {
-        mDelegate = [[QT_MANGLE_NAMESPACE(QNSColorPanelDelegate) alloc] init];
+        mDelegate = [[QNSColorPanelDelegate alloc] init];
    }

    ~QCocoaColorPanel()
@ -366,7 +366,7 @@ public:
    }

 private:
-    QT_MANGLE_NAMESPACE(QNSColorPanelDelegate) *mDelegate;
+    QNSColorPanelDelegate *mDelegate;
 };

 Q_GLOBAL_STATIC(QCocoaColorPanel, sharedColorPanel)
--- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h
+++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h
@ -43,10 +43,16 @@
 #include <QObject>
 #include <QtWidgets/qtwidgetsglobal.h>
 #include <qpa/qplatformdialoghelper.h>
+#include <QtCore/private/qcore_mac_p.h>
+
+#import <AppKit/NSSavePanel.h>

 QT_REQUIRE_CONFIG(filedialog);

-Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate));
+@interface QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) : NSObject<NSOpenSavePanelDelegate>
+@end
+
+QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSOpenSavePanelDelegate);

 QT_BEGIN_NAMESPACE

@ -84,7 +90,7 @@ public:
    void QNSOpenSavePanelDelegate_filterSelected(int menuIndex);

 private:
-    QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *mDelegate;
+    QNSOpenSavePanelDelegate *mDelegate;
    QUrl mDir;
 };

--- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
+++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
@ -76,27 +76,6 @@ QT_USE_NAMESPACE

 typedef QSharedPointer<QFileDialogOptions> SharedPointerFileDialogOptions;

-@interface QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate)
-    : NSObject<NSOpenSavePanelDelegate>
-
- (NSString *)strip:(const QString &)label;
- (BOOL)panel:(id)sender shouldEnableURL:(NSURL *)url;
- (void)filterChanged:(id)sender;
- (void)showModelessPanel;
- (BOOL)runApplicationModalPanel;
- (void)showWindowModalSheet:(QWindow *)docWidget;
- (void)updateProperties;
- (QStringList)acceptableExtensionsForSave;
- (QString)removeExtensions:(const QString &)filter;
- (void)createTextField;
- (void)createPopUpButton:(const QString &)selectedFilter hideDetails:(BOOL)hideDetails;
- (QStringList)findStrippedFilterWithVisualFilterName:(QString)name;
- (void)createAccessory;
-
-@end
-
-QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSOpenSavePanelDelegate);
-
@implementation QNSOpenSavePanelDelegate {
    @public
    NSOpenPanel *mOpenPanel;
--- a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm
+++ b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm
@ -283,7 +283,7 @@ class QCocoaFontPanel
 public:
    QCocoaFontPanel()
    {
-        mDelegate = [[QT_MANGLE_NAMESPACE(QNSFontPanelDelegate) alloc] init];
+        mDelegate = [[QNSFontPanelDelegate alloc] init];
    }

    ~QCocoaFontPanel()
@ -356,7 +356,7 @@ public:
    }

 private:
-    QT_MANGLE_NAMESPACE(QNSFontPanelDelegate) *mDelegate;
+    QNSFontPanelDelegate *mDelegate;
 };

 Q_GLOBAL_STATIC(QCocoaFontPanel, sharedFontPanel)
--- a/src/plugins/platforms/cocoa/qcocoamenu.h
+++ b/src/plugins/platforms/cocoa/qcocoamenu.h
@ -44,8 +44,7 @@
 #include <QtCore/QList>
 #include <qpa/qplatformmenu.h>
 #include "qcocoamenuitem.h"
-
-Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QCocoaNSMenu));
+#include "qcocoansmenu.h"

 QT_BEGIN_NAMESPACE

@ -107,7 +106,7 @@ private:
    void scheduleUpdate();

    QList<QCocoaMenuItem *> m_menuItems;
-    QT_MANGLE_NAMESPACE(QCocoaNSMenu) *m_nativeMenu;
+    QCocoaNSMenu *m_nativeMenu;
    NSMenuItem *m_attachedItem;
    int m_updateTimer;
    bool m_enabled:1;
--- a/src/plugins/platforms/cocoa/qcocoamenubar.mm
+++ b/src/plugins/platforms/cocoa/qcocoamenubar.mm
@ -278,12 +278,11 @@ void QCocoaMenuBar::updateMenuBarImmediately()
        // we still have to update the menubar.
        if ((win->flags() & Qt::WindowType_Mask) != Qt::Tool)
            return;
-        typedef QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) AppDelegate;
        NSApplication *app = [NSApplication sharedApplication];
-        if (![app.delegate isKindOfClass:[AppDelegate class]])
+        if (![app.delegate isKindOfClass:[QCocoaApplicationDelegate class]])
            return;
        // We apply this logic _only_ during the startup.
-        AppDelegate *appDelegate = app.delegate;
+        QCocoaApplicationDelegate *appDelegate = app.delegate;
        if (!appDelegate.inLaunch)
            return;
    }
@ -403,3 +402,4 @@ QCocoaWindow *QCocoaMenuBar::cocoaWindow() const

 QT_END_NAMESPACE

+#include "moc_qcocoamenubar.cpp"
--- a/src/plugins/platforms/cocoa/qcocoansmenu.h
+++ b/src/plugins/platforms/cocoa/qcocoansmenu.h
@ -59,31 +59,20 @@ QT_FORWARD_DECLARE_CLASS(QCocoaMenu);
 QT_FORWARD_DECLARE_CLASS(QCocoaMenuItem);

@interface QT_MANGLE_NAMESPACE(QCocoaNSMenuDelegate) : NSObject <NSMenuDelegate>
-
 + (instancetype)sharedMenuDelegate;
-
- (NSMenuItem *)findItemInMenu:(NSMenu *)menu
-                        forKey:(NSString *)key
-                     modifiers:(NSUInteger)modifiers;
-
+- (NSMenuItem *)findItemInMenu:(NSMenu *)menu forKey:(NSString *)key modifiers:(NSUInteger)modifiers;
@end

@interface QT_MANGLE_NAMESPACE(QCocoaNSMenu) : NSMenu
-
@property (readonly, nonatomic) QCocoaMenu *platformMenu;
-
 - (instancetype)initWithPlatformMenu:(QCocoaMenu *)menu;
-
@end

@interface QT_MANGLE_NAMESPACE(QCocoaNSMenuItem) : NSMenuItem
-
@property (nonatomic) QCocoaMenuItem *platformMenuItem;
-
 + (instancetype)separatorItemWithPlatformMenuItem:(QCocoaMenuItem *)menuItem;
 - (instancetype)initWithPlatformMenuItem:(QCocoaMenuItem *)menuItem;
 - (instancetype)init;
-
@end

 QT_NAMESPACE_ALIAS_OBJC_CLASS(QCocoaNSMenu);
--- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
+++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
@ -80,6 +80,8 @@
 #include <qimagewriter.h>
 #include <qdebug.h>

+#include <QtCore/private/qcore_mac_p.h>
+
 #include "qcocoamenu.h"

 #include "qt_mac_p.h"
@ -92,8 +94,6 @@

 QT_USE_NAMESPACE

-@class QT_MANGLE_NAMESPACE(QNSImageView);
-
@interface QT_MANGLE_NAMESPACE(QNSStatusItem) : NSObject <NSUserNotificationCenterDelegate>
@property (nonatomic, assign) QCocoaMenu *menu;
@property (nonatomic, assign) QIcon icon;
@ -104,12 +104,13 @@ QT_USE_NAMESPACE
 - (void)doubleClickSelector:(id)sender;
@end

+QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSStatusItem);
+
@interface QT_MANGLE_NAMESPACE(QNSImageView) : NSImageView
@property (nonatomic, assign) BOOL down;
-@property (nonatomic, assign) QT_MANGLE_NAMESPACE(QNSStatusItem) *parent;
+@property (nonatomic, assign) QNSStatusItem *parent;
@end

-QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSStatusItem);
 QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSImageView);

 QT_BEGIN_NAMESPACE
@ -364,7 +365,7 @@ QT_END_NAMESPACE
@implementation QNSStatusItem {
    QCocoaSystemTrayIcon *systray;
    NSStatusItem *item;
-    QT_MANGLE_NAMESPACE(QNSImageView) *imageCell;
+    QNSImageView *imageCell;
 }

@synthesize menu = menu;
--- a/src/plugins/platforms/cocoa/qcocoatheme.h
+++ b/src/plugins/platforms/cocoa/qcocoatheme.h
@ -43,8 +43,6 @@
 #include <QtCore/QHash>
 #include <qpa/qplatformtheme.h>

-Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QCocoaThemeAppAppearanceObserver));
-
 #include <QtCore/private/qcore_mac_p.h>

 QT_BEGIN_NAMESPACE
--- a/src/plugins/platforms/cocoa/qnsview.h
+++ b/src/plugins/platforms/cocoa/qnsview.h
@ -51,37 +51,30 @@ class QCocoaGLContext;
 class QPointF;
 QT_END_NAMESPACE

-Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QNSViewMouseMoveHelper));
-Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QCocoaNSMenuItem));
-
@interface QT_MANGLE_NAMESPACE(QNSView) : NSView
-
@property (nonatomic, retain) NSCursor *cursor;
-
 - (instancetype)initWithCocoaWindow:(QCocoaWindow *)platformWindow;
-
 - (void)convertFromScreen:(NSPoint)mouseLocation toWindowPoint:(QPointF *)qtWindowPoint andScreenPoint:(QPointF *)qtScreenPoint;
-
-@end
-
-@interface QT_MANGLE_NAMESPACE(QNSView) (MouseAPI)
- (void)handleFrameStrutMouseEvent:(NSEvent *)theEvent;
- (void)resetMouseButtons;
-@end
-
-@interface QT_MANGLE_NAMESPACE(QNSView) (KeysAPI)
-+ (Qt::KeyboardModifiers)convertKeyModifiers:(ulong)modifierFlags;
-@end
-
-@interface QT_MANGLE_NAMESPACE(QNSView) (ComplexTextAPI)
- (void)unmarkText;
- (void)cancelComposingText;
-@end
-
-@interface QT_MANGLE_NAMESPACE(QNSView) (QtExtras)
-@property (nonatomic, readonly) QCocoaWindow *platformWindow;
@end

 QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSView);

+@interface QNSView (MouseAPI)
+- (void)handleFrameStrutMouseEvent:(NSEvent *)theEvent;
+- (void)resetMouseButtons;
+@end
+
+@interface QNSView (KeysAPI)
+ (Qt::KeyboardModifiers)convertKeyModifiers:(ulong)modifierFlags;
+@end
+
+@interface QNSView (ComplexTextAPI)
+- (void)unmarkText;
+- (void)cancelComposingText;
+@end
+
+@interface QNSView (QtExtras)
+@property (nonatomic, readonly) QCocoaWindow *platformWindow;
+@end
+
 #endif //QNSVIEW_H
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@ -66,13 +66,13 @@
 #include "qcocoaintegration.h"

 // Private interface
-@interface QT_MANGLE_NAMESPACE(QNSView) ()
+@interface QNSView ()
 - (BOOL)isTransparentForUserInput;
@property (assign) NSView* previousSuperview;
@property (assign) NSWindow* previousWindow;
@end

-@interface QT_MANGLE_NAMESPACE(QNSView) (Drawing) <CALayerDelegate>
+@interface QNSView (Drawing) <CALayerDelegate>
 - (void)initDrawing;
@end

@ -84,7 +84,9 @@
 - (void)cursorUpdate:(NSEvent *)theEvent;
@end

-@interface QT_MANGLE_NAMESPACE(QNSView) (Mouse)
+QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSViewMouseMoveHelper);
+
+@interface QNSView (Mouse)
 - (void)initMouse;
 - (NSPoint)screenMousePoint:(NSEvent *)theEvent;
 - (void)mouseMovedImpl:(NSEvent *)theEvent;
@ -92,28 +94,28 @@
 - (void)mouseExitedImpl:(NSEvent *)theEvent;
@end

-@interface QT_MANGLE_NAMESPACE(QNSView) (Touch)
+@interface QNSView (Touch)
@end

-@interface QT_MANGLE_NAMESPACE(QNSView) (Tablet)
+@interface QNSView (Tablet)
 - (bool)handleTabletEvent:(NSEvent *)theEvent;
@end

-@interface QT_MANGLE_NAMESPACE(QNSView) (Gestures)
+@interface QNSView (Gestures)
@end

-@interface QT_MANGLE_NAMESPACE(QNSView) (Dragging)
+@interface QNSView (Dragging)
 -(void)registerDragTypes;
@end

-@interface QT_MANGLE_NAMESPACE(QNSView) (Keys)
+@interface QNSView (Keys)
@end

-@interface QT_MANGLE_NAMESPACE(QNSView) (ComplexText) <NSTextInputClient>
+@interface QNSView (ComplexText) <NSTextInputClient>
 - (void)textInputContextKeyboardSelectionDidChangeNotification:(NSNotification *)textInputContextKeyboardSelectionDidChangeNotification;
@end

-@implementation QT_MANGLE_NAMESPACE(QNSView) {
+@implementation QNSView {
    QPointer<QCocoaWindow> m_platformWindow;
    Qt::MouseButtons m_buttons;
    Qt::MouseButtons m_acceptedMouseDowns;
@ -125,7 +127,7 @@
    bool m_sendUpAsRightButton;
    Qt::KeyboardModifiers m_currentWheelModifiers;
    NSString *m_inputSource;
-    QT_MANGLE_NAMESPACE(QNSViewMouseMoveHelper) *m_mouseMoveHelper;
+    QNSViewMouseMoveHelper *m_mouseMoveHelper;
    bool m_resendKeyEvent;
    bool m_scrolling;
    bool m_updatingDrag;
@ -379,7 +381,7 @@

 // -----------------------------------------------------

-@implementation QT_MANGLE_NAMESPACE(QNSView) (QtExtras)
+@implementation QNSView (QtExtras)

 - (QCocoaWindow*)platformWindow
 {
--- a/src/plugins/platforms/cocoa/qnsview_accessibility.mm
+++ b/src/plugins/platforms/cocoa/qnsview_accessibility.mm
@ -47,7 +47,7 @@

 #import <AppKit/NSAccessibility.h>

-@implementation QT_MANGLE_NAMESPACE(QNSView) (Accessibility)
+@implementation QNSView (Accessibility)

 - (id)childAccessibleElement
 {
--- a/src/plugins/platforms/cocoa/qnsview_complextext.mm
+++ b/src/plugins/platforms/cocoa/qnsview_complextext.mm
@ -39,7 +39,7 @@

 // This file is included from qnsview.mm, and only used to organize the code

-@implementation QT_MANGLE_NAMESPACE(QNSView) (ComplexTextAPI)
+@implementation QNSView (ComplexTextAPI)

 - (void)cancelComposingText
 {
@ -80,7 +80,7 @@

@end

-@implementation QT_MANGLE_NAMESPACE(QNSView) (ComplexText)
+@implementation QNSView (ComplexText)

 - (void)insertNewline:(id)sender
 {
--- a/src/plugins/platforms/cocoa/qnsview_dragging.mm
+++ b/src/plugins/platforms/cocoa/qnsview_dragging.mm
@ -39,7 +39,7 @@

 // This file is included from qnsview.mm, and only used to organize the code

-@implementation QT_MANGLE_NAMESPACE(QNSView) (Dragging)
+@implementation QNSView (Dragging)

 -(void)registerDragTypes
 {
--- a/src/plugins/platforms/cocoa/qnsview_drawing.mm
+++ b/src/plugins/platforms/cocoa/qnsview_drawing.mm
@ -39,7 +39,7 @@

 // This file is included from qnsview.mm, and only used to organize the code

-@implementation QT_MANGLE_NAMESPACE(QNSView) (Drawing)
+@implementation QNSView (Drawing)

 - (void)initDrawing
 {
--- a/src/plugins/platforms/cocoa/qnsview_gestures.mm
+++ b/src/plugins/platforms/cocoa/qnsview_gestures.mm
@ -43,7 +43,7 @@

 Q_LOGGING_CATEGORY(lcQpaGestures, "qt.qpa.input.gestures")

-@implementation QT_MANGLE_NAMESPACE(QNSView) (Gestures)
+@implementation QNSView (Gestures)

 - (bool)handleGestureAsBeginEnd:(NSEvent *)event
 {
--- a/src/plugins/platforms/cocoa/qnsview_keys.mm
+++ b/src/plugins/platforms/cocoa/qnsview_keys.mm
@ -39,7 +39,7 @@

 // This file is included from qnsview.mm, and only used to organize the code

-@implementation QT_MANGLE_NAMESPACE(QNSView) (KeysAPI)
+@implementation QNSView (KeysAPI)

 + (Qt::KeyboardModifiers)convertKeyModifiers:(ulong)modifierFlags
 {
@ -60,7 +60,7 @@

@end

-@implementation QT_MANGLE_NAMESPACE(QNSView) (Keys)
+@implementation QNSView (Keys)

 - (int)convertKeyCode:(QChar)keyChar
 {
--- a/src/plugins/platforms/cocoa/qnsview_menus.mm
+++ b/src/plugins/platforms/cocoa/qnsview_menus.mm
@ -53,11 +53,11 @@ static bool selectorIsCutCopyPaste(SEL selector)
            || selector == @selector(selectAll:));
 }

-@interface QT_MANGLE_NAMESPACE(QNSView) (Menus)
+@interface QNSView (Menus)
 - (void)qt_itemFired:(QCocoaNSMenuItem *)item;
@end

-@implementation QT_MANGLE_NAMESPACE(QNSView) (Menus)
+@implementation QNSView (Menus)

 - (BOOL)validateMenuItem:(NSMenuItem*)item
 {
--- a/src/plugins/platforms/cocoa/qnsview_mouse.mm
+++ b/src/plugins/platforms/cocoa/qnsview_mouse.mm
@ -55,7 +55,7 @@
    interact with the responder chain by e.g. calling super if Qt does not
    accept the mouse event
 */
-@implementation QT_MANGLE_NAMESPACE(QNSViewMouseMoveHelper) {
+@implementation QNSViewMouseMoveHelper {
    QNSView *view;
 }

@ -89,7 +89,7 @@

@end

-@implementation QT_MANGLE_NAMESPACE(QNSView) (MouseAPI)
+@implementation QNSView (MouseAPI)

 - (void)resetMouseButtons
 {
@ -178,7 +178,7 @@
 }
@end

-@implementation QT_MANGLE_NAMESPACE(QNSView) (Mouse)
+@implementation QNSView (Mouse)

 - (void)initMouse
 {
@ -193,7 +193,7 @@
    m_dontOverrideCtrlLMB = qt_mac_resolveOption(false, m_platformWindow->window(),
            "_q_platform_MacDontOverrideCtrlLMB", "QT_MAC_DONT_OVERRIDE_CTRL_LMB");

-    m_mouseMoveHelper = [[QT_MANGLE_NAMESPACE(QNSViewMouseMoveHelper) alloc] initWithView:self];
+    m_mouseMoveHelper = [[QNSViewMouseMoveHelper alloc] initWithView:self];

    NSUInteger trackingOptions = NSTrackingActiveInActiveApp
        | NSTrackingMouseEnteredAndExited | NSTrackingCursorUpdate;
--- a/src/plugins/platforms/cocoa/qnsview_tablet.mm
+++ b/src/plugins/platforms/cocoa/qnsview_tablet.mm
@ -54,7 +54,7 @@ struct QCocoaTabletDeviceData
 typedef QHash<uint, QCocoaTabletDeviceData> QCocoaTabletDeviceDataHash;
 Q_GLOBAL_STATIC(QCocoaTabletDeviceDataHash, tabletDeviceDataHash)

-@implementation QT_MANGLE_NAMESPACE(QNSView) (Tablet)
+@implementation QNSView (Tablet)

 - (bool)handleTabletEvent:(NSEvent *)theEvent
 {
--- a/src/plugins/platforms/cocoa/qnsview_touch.mm
+++ b/src/plugins/platforms/cocoa/qnsview_touch.mm
@ -41,7 +41,7 @@

 Q_LOGGING_CATEGORY(lcQpaTouch, "qt.qpa.input.touch")

-@implementation QT_MANGLE_NAMESPACE(QNSView) (Touch)
+@implementation QNSView (Touch)

 - (bool)shouldSendSingleTouch
 {
--- a/src/plugins/platforms/cocoa/qprintengine_mac_p.h
+++ b/src/plugins/platforms/cocoa/qprintengine_mac_p.h
@ -64,11 +64,7 @@

 #include "qpaintengine_mac_p.h"

-#ifdef __OBJC__
-@class NSPrintInfo;
-#else
-typedef void NSPrintInfo;
-#endif
+Q_FORWARD_DECLARE_OBJC_CLASS(NSPrintInfo);

 QT_BEGIN_NAMESPACE

--- a/Show More
+++ b/Show More