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

5 files changed, 38 insertions, 19 deletions

diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 129569a466..f49461b2d0 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -1904,9 +1904,12 @@ bool QApplication::event(QEvent *e)
     }
 
     if(e->type() == QEvent::LanguageChange) {
+        // QGuiApplication::event does not account for the cases where
+        // there is a top level widget without a window handle. So they
+        // need to have the event posted here
         const QWidgetList list = topLevelWidgets();
         for (auto *w : list) {
-            if (!(w->windowType() == Qt::Desktop))
+            if (!w->windowHandle() && (w->windowType() != Qt::Desktop))
                 postEvent(w, new QEvent(QEvent::LanguageChange));
         }
     }
@@ -3299,7 +3302,7 @@ QT_WARNING_POP
             bool eventAccepted = tablet->isAccepted();
             while (w) {
                 QTabletEvent te(tablet->type(), relpos, tablet->globalPosF(),
-                                tablet->device(), tablet->pointerType(),
+                                tablet->deviceType(), tablet->pointerType(),
                                 tablet->pressure(), tablet->xTilt(), tablet->yTilt(),
                                 tablet->tangentialPressure(), tablet->rotation(), tablet->z(),
                                 tablet->modifiers(), tablet->uniqueId(), tablet->button(), tablet->buttons());
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();
     }
diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h
index 0d0077548c..3c29b48973 100644
--- a/src/widgets/kernel/qwidget_p.h
+++ b/src/widgets/kernel/qwidget_p.h
@@ -672,6 +672,7 @@ public:
     // Other variables.
     uint directFontResolveMask;
     uint inheritedFontResolveMask;
+    decltype(std::declval<QPalette>().resolve()) directPaletteResolveMask;
     QPalette::ResolveMask inheritedPaletteResolveMask;
     short leftmargin;
     short topmargin;
diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp
index 904067afda..4ba5469e9d 100644
--- a/src/widgets/kernel/qwidgetwindow.cpp
+++ b/src/widgets/kernel/qwidgetwindow.cpp
@@ -727,19 +727,6 @@ bool QWidgetWindow::updateSize()
     return changed;
 }
 
-bool QWidgetWindow::updatePos()
-{
-    bool changed = false;
-    if (m_widget->testAttribute(Qt::WA_OutsideWSRange))
-        return changed;
-    if (m_widget->data->crect.topLeft() != geometry().topLeft()) {
-        changed = true;
-        m_widget->data->crect.moveTopLeft(geometry().topLeft());
-    }
-    updateMargins();
-    return changed;
-}
-
 void QWidgetWindow::updateMargins()
 {
     const QMargins margins = frameMargins();
@@ -800,8 +787,28 @@ void QWidgetWindow::updateNormalGeometry()
 
 void QWidgetWindow::handleMoveEvent(QMoveEvent *event)
 {
-    if (updatePos())
-        QGuiApplication::forwardEvent(m_widget, event);
+    if (m_widget->testAttribute(Qt::WA_OutsideWSRange))
+        return;
+
+    auto oldPosition = m_widget->data->crect.topLeft();
+    auto newPosition = geometry().topLeft();
+
+    if (!m_widget->isTopLevel()) {
+        if (auto *nativeParent = m_widget->nativeParentWidget())
+            newPosition = m_widget->parentWidget()->mapFrom(nativeParent, newPosition);
+    }
+
+    bool changed = newPosition != oldPosition;
+
+    if (changed)
+        m_widget->data->crect.moveTopLeft(newPosition);
+
+    updateMargins(); // FIXME: Only do when changed?
+
+    if (changed) {
+        QMoveEvent widgetEvent(newPosition, oldPosition);
+        QGuiApplication::forwardEvent(m_widget, &widgetEvent, event);
+    }
 }
 
 void QWidgetWindow::handleResizeEvent(QResizeEvent *event)
diff --git a/src/widgets/kernel/qwidgetwindow_p.h b/src/widgets/kernel/qwidgetwindow_p.h
index 80a345465d..5689e129c3 100644
--- a/src/widgets/kernel/qwidgetwindow_p.h
+++ b/src/widgets/kernel/qwidgetwindow_p.h
@@ -125,7 +125,6 @@ private slots:
 private:
     void repaintWindow();
     bool updateSize();
-    bool updatePos();
     void updateMargins();
     void updateNormalGeometry();