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

 Conflicts:
	examples/network/bearermonitor/CMakeLists.txt
	examples/network/CMakeLists.txt
	src/corelib/tools/qlinkedlist.h
	src/sql/kernel/qsqldriver_p.h
	src/sql/kernel/qsqlresult_p.h
	src/widgets/kernel/qwidget.cpp
	src/widgets/kernel/qwidget_p.h
	tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
	tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
	tests/auto/tools/moc/allmocs_baseline_in.json

Change-Id: I21a3c34570ae79ea9d30107fae71759d7eac17d9

1 files changed, 10 insertions, 1 deletions

diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index c5379941ef..b4699ae040 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -152,6 +152,7 @@ QWidgetPrivate::QWidgetPrivate(int version)
 #endif
       , directFontResolveMask(0)
       , inheritedFontResolveMask(0)
+      , directPaletteResolveMask(0)
       , inheritedPaletteResolveMask(0)
       , leftmargin(0)
       , topmargin(0)
@@ -1850,7 +1851,9 @@ void QWidgetPrivate::propagatePaletteChange()
         if (q->isWindow() && !q->testAttribute(Qt::WA_WindowPropagation)) {
         inheritedPaletteResolveMask = 0;
     }
-    QPalette::ResolveMask mask = data.pal.resolve() | inheritedPaletteResolveMask;
+
+    directPaletteResolveMask = data.pal.resolve();
+    auto mask = directPaletteResolveMask | inheritedPaletteResolveMask;
 
     const bool useStyleSheetPropagationInWidgetStyles =
         QCoreApplication::testAttribute(Qt::AA_UseStyleSheetPropagationInWidgetStyles);
@@ -10454,6 +10457,12 @@ void QWidget::setParent(QWidget *parent, Qt::WindowFlags f)
 
     if (!useStyleSheetPropagationInWidgetStyles && !testAttribute(Qt::WA_StyleSheet)
         && (!parent || !parent->testAttribute(Qt::WA_StyleSheet))) {
+        // if the parent has a font set or inherited, then propagate the mask to the new child
+        if (parent) {
+            const auto pd = parent->d_func();
+            d->inheritedFontResolveMask = pd->directFontResolveMask | pd->inheritedFontResolveMask;
+            d->inheritedPaletteResolveMask = pd->directPaletteResolveMask | pd->inheritedPaletteResolveMask;
+        }
         d->resolveFont();
         d->resolvePalette();
     }