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

 Conflicts:
	tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/network/access/spdy/tst_spdy.cpp

Change-Id: I3196c5f7b34f2ffc9ef1e690d02d5b9bb3270a74

1 files changed, 89 insertions, 52 deletions

diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 6503acaef0..d72cc2df79 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -236,21 +236,6 @@ static bool qt_detectRTLLanguage()
                          " and Arabic) to get proper widget layout.") == QLatin1String("RTL"));
 }
 
-static void initPalette()
-{
-    if (!QGuiApplicationPrivate::app_pal)
-        if (const QPalette *themePalette = QGuiApplicationPrivate::platformTheme()->palette())
-            QGuiApplicationPrivate::app_pal = new QPalette(*themePalette);
-    if (!QGuiApplicationPrivate::app_pal)
-        QGuiApplicationPrivate::app_pal = new QPalette(Qt::gray);
-}
-
-static inline void clearPalette()
-{
-    delete QGuiApplicationPrivate::app_pal;
-    QGuiApplicationPrivate::app_pal = nullptr;
-}
-
 static void initFontUnlocked()
 {
     if (!QGuiApplicationPrivate::app_font) {
@@ -605,8 +590,13 @@ static QWindowGeometrySpecification windowGeometrySpecification = Q_WINDOW_GEOME
     The following parameters are available for \c {-platform windows}:
 
     \list
+        \li \c {altgr}, detect the key \c {AltGr} found on some keyboards as
+               Qt::GroupSwitchModifier (since Qt 5.12).
         \li \c {dialogs=[xp|none]}, \c xp uses XP-style native dialogs and
             \c none disables them.
+
+        \li \c {dpiawareness=[0|1|2} Sets the DPI awareness of the process
+               (see \l{High DPI Displays}, since Qt 5.4).
         \li \c {fontengine=freetype}, uses the FreeType font engine.
         \li \c {menus=[native|none]}, controls the use of native menus.
 
@@ -616,10 +606,23 @@ static QWindowGeometrySpecification windowGeometrySpecification = Q_WINDOW_GEOME
                provide hover signals. They are mainly intended for Qt Quick.
                By default, they will be used if the application is not an
                instance of QApplication or for Qt Quick Controls 2
-               applications.
+               applications (since Qt 5.10).
 
-        \li \c {altgr}, detect the key \c {AltGr} found on some keyboards as
-               Qt::GroupSwitchModifier.
+        \li \c {nocolorfonts} Turn off DirectWrite Color fonts
+               (since Qt 5.8).
+
+        \li \c {nodirectwrite} Turn off DirectWrite fonts (since Qt 5.8).
+
+        \li \c {nomousefromtouch} Ignores mouse events synthesized
+               from touch events by the operating system.
+
+        \li \c {nowmpointer} Switches from Pointer Input Messages handling
+               to legacy mouse handling (since Qt 5.12).
+        \li \c {reverse} Activates Right-to-left mode (experimental).
+               Windows title bars will be shown accordingly in Right-to-left locales
+               (since Qt 5.13).
+        \li \c {tabletabsoluterange=<value>} Sets a value for mouse mode detection
+               of WinTab tablets (Legacy, since Qt 5.3).
     \endlist
 
     The following parameter is available for \c {-platform cocoa} (on macOS):
@@ -673,7 +676,7 @@ QGuiApplication::~QGuiApplication()
     d->session_manager = nullptr;
 #endif //QT_NO_SESSIONMANAGER
 
-    clearPalette();
+    QGuiApplicationPrivate::clearPalette();
     QFontDatabase::removeAllApplicationFonts();
 
 #ifndef QT_NO_CURSOR
@@ -1597,7 +1600,7 @@ void QGuiApplicationPrivate::init()
     if (platform_integration == nullptr)
         createPlatformIntegration();
 
-    initPalette();
+    updatePalette();
     QFont::initialize();
     initThemeHints();
 
@@ -3275,46 +3278,97 @@ QClipboard * QGuiApplication::clipboard()
 */
 
 /*!
-    Returns the default application palette.
+    Returns the current application palette.
+
+    Roles that have not been explicitly set will reflect the system's platform theme.
 
     \sa setPalette()
 */
 
 QPalette QGuiApplication::palette()
 {
-    initPalette();
+    if (!QGuiApplicationPrivate::app_pal)
+        QGuiApplicationPrivate::updatePalette();
+
     return *QGuiApplicationPrivate::app_pal;
 }
 
+void QGuiApplicationPrivate::updatePalette()
+{
+    if (app_pal) {
+        if (setPalette(*app_pal) && qGuiApp)
+            qGuiApp->d_func()->handlePaletteChanged();
+    } else {
+        setPalette(QPalette());
+    }
+}
+
+void QGuiApplicationPrivate::clearPalette()
+{
+    delete app_pal;
+    app_pal = nullptr;
+}
+
 /*!
-    Changes the default application palette to \a pal.
+    Changes the application palette to \a pal.
+
+    The color roles from this palette are combined with the system's platform
+    theme to form the application's final palette.
 
     \sa palette()
 */
 void QGuiApplication::setPalette(const QPalette &pal)
 {
-    if (!QGuiApplicationPrivate::setPalette(pal))
-        return;
-
-    QCoreApplication::setAttribute(Qt::AA_SetPalette);
-
-    if (qGuiApp)
-        qGuiApp->d_func()->sendApplicationPaletteChange();
+    if (QGuiApplicationPrivate::setPalette(pal) && qGuiApp)
+        qGuiApp->d_func()->handlePaletteChanged();
 }
 
 bool QGuiApplicationPrivate::setPalette(const QPalette &palette)
 {
-    if (app_pal && palette.isCopyOf(*app_pal))
+    // Resolve the palette against the theme palette, filling in
+    // any missing roles, while keeping the original resolve mask.
+    QPalette basePalette = qGuiApp ? qGuiApp->d_func()->basePalette() : Qt::gray;
+    basePalette.resolve(0); // The base palette only contributes missing colors roles
+    QPalette resolvedPalette = palette.resolve(basePalette);
+
+    if (app_pal && resolvedPalette == *app_pal && resolvedPalette.resolve() == app_pal->resolve())
         return false;
 
     if (!app_pal)
-        app_pal = new QPalette(palette);
+        app_pal = new QPalette(resolvedPalette);
     else
-        *app_pal = palette;
+        *app_pal = resolvedPalette;
+
+    QCoreApplication::setAttribute(Qt::AA_SetPalette, app_pal->resolve() != 0);
 
     return true;
 }
 
+/*
+    Returns the base palette used to fill in missing roles in
+    the current application palette.
+
+    Normally this is the theme palette, but QApplication
+    overrides this for compatibility reasons.
+*/
+QPalette QGuiApplicationPrivate::basePalette() const
+{
+    return platformTheme() ? *platformTheme()->palette() : Qt::gray;
+}
+
+void QGuiApplicationPrivate::handlePaletteChanged(const char *className)
+{
+    if (!className) {
+        Q_ASSERT(app_pal);
+        emit qGuiApp->paletteChanged(*QGuiApplicationPrivate::app_pal);
+    }
+
+    if (is_app_running && !is_app_closing) {
+        QEvent event(QEvent::ApplicationPaletteChange);
+        QGuiApplication::sendEvent(qGuiApp, &event);
+    }
+}
+
 void QGuiApplicationPrivate::applyWindowGeometrySpecificationTo(QWindow *window)
 {
     windowGeometrySpecification.applyTo(window);
@@ -4113,11 +4167,8 @@ QPixmap QGuiApplicationPrivate::getPixmapCursor(Qt::CursorShape cshape)
 
 void QGuiApplicationPrivate::notifyThemeChanged()
 {
-    if (!testAttribute(Qt::AA_SetPalette)) {
-        clearPalette();
-        initPalette();
-        sendApplicationPaletteChange();
-    }
+    updatePalette();
+
     if (!(applicationResourceFlags & ApplicationFontExplicitlySet)) {
         const auto locker = qt_scoped_lock(applicationFontMutex);
         clearFontUnlocked();
@@ -4126,20 +4177,6 @@ void QGuiApplicationPrivate::notifyThemeChanged()
     initThemeHints();
 }
 
-void QGuiApplicationPrivate::sendApplicationPaletteChange(bool toAllWidgets, const char *className)
-{
-    Q_UNUSED(toAllWidgets)
-
-    if (!className)
-        emit qGuiApp->paletteChanged(*QGuiApplicationPrivate::app_pal);
-
-    if (!is_app_running || is_app_closing)
-        return;
-
-    QEvent event(QEvent::ApplicationPaletteChange);
-    QGuiApplication::sendEvent(QGuiApplication::instance(), &event);
-}
-
 #if QT_CONFIG(draganddrop)
 void QGuiApplicationPrivate::notifyDragStarted(const QDrag *drag)
 {