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

Conflicts:
	src/corelib/io/qfilesystemengine_win.cpp
	src/gui/text/qdistancefield.cpp
	src/plugins/platforms/xcb/qxcbconnection.h

Change-Id: I1be4a6f440ccb7599991159e3cb9de60990e4b1e

3 files changed, 17 insertions, 2 deletions

diff --git a/src/widgets/kernel/qlayoutitem.cpp b/src/widgets/kernel/qlayoutitem.cpp
index ee0c28ec76..51793bf060 100644
--- a/src/widgets/kernel/qlayoutitem.cpp
+++ b/src/widgets/kernel/qlayoutitem.cpp
@@ -767,7 +767,7 @@ QWidgetItemV2::QWidgetItemV2(QWidget *widget)
 QWidgetItemV2::~QWidgetItemV2()
 {
     if (wid) {
-        QWidgetPrivate *wd = wid->d_func();
+        auto *wd = static_cast<QWidgetPrivate *>(QObjectPrivate::get(wid));
         if (wd->widgetItem == this)
             wd->widgetItem = 0;
     }
diff --git a/src/widgets/kernel/qopenglwidget.cpp b/src/widgets/kernel/qopenglwidget.cpp
index 4d45782170..e401444e6e 100644
--- a/src/widgets/kernel/qopenglwidget.cpp
+++ b/src/widgets/kernel/qopenglwidget.cpp
@@ -537,6 +537,7 @@ public:
           w(widget) { }
 
     void beginPaint() Q_DECL_OVERRIDE;
+    void endPaint() Q_DECL_OVERRIDE;
 
     QOpenGLWidget *w;
 };
@@ -634,6 +635,16 @@ void QOpenGLWidgetPaintDevicePrivate::beginPaint()
     }
 }
 
+void QOpenGLWidgetPaintDevicePrivate::endPaint()
+{
+    QOpenGLWidgetPrivate *wd = static_cast<QOpenGLWidgetPrivate *>(QWidgetPrivate::get(w));
+    if (!wd->initialized)
+        return;
+
+    if (!wd->inPaintGL)
+        QOpenGLContextPrivate::get(wd->context)->defaultFboRedirect = 0;
+}
+
 void QOpenGLWidgetPaintDevice::ensureActiveTarget()
 {
     QOpenGLWidgetPaintDevicePrivate *d = static_cast<QOpenGLWidgetPaintDevicePrivate *>(d_ptr.data());
@@ -646,6 +657,9 @@ void QOpenGLWidgetPaintDevice::ensureActiveTarget()
     else
         wd->fbo->bind();
 
+    if (!wd->inPaintGL)
+        QOpenGLContextPrivate::get(wd->context)->defaultFboRedirect = wd->fbo->handle();
+
     // When used as a viewport, drawing is done via opening a QPainter on the widget
     // without going through paintEvent(). We will have to make sure a glFlush() is done
     // before the texture is accessed also in this case.
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 62d723bea5..1452bb36ae 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -9199,7 +9199,8 @@ bool QWidget::event(QEvent *event)
             const QWindow *win = te->window;
             d->setWinId((win && win->handle()) ? win->handle()->winId() : 0);
         }
-        d->updateFont(d->data.fnt);
+        if (d->data.fnt.d->dpi != logicalDpiY())
+            d->updateFont(d->data.fnt);
 #ifndef QT_NO_OPENGL
         d->renderToTextureReallyDirty = 1;
 #endif