Merge remote branch 'staging/master' into refactor

Conflicts:
	src/opengl/qgl_qpa.cpp
	src/plugins/platforms/glxconvenience/qglxconvenience.cpp
	src/plugins/platforms/platforms.pro
	src/plugins/platforms/wayland/qwaylandwindow.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/plugins/platforms/xcb/qxcbwindow.h
	src/plugins/platforms/xcb/qxcbwindowsurface.cpp
	src/widgets/kernel/qwidget_qpa.cpp
	tests/auto/qvariant/tst_qvariant.cpp

1 files changed, 7 insertions, 0 deletions

diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp
index 6721fdbb6a..02487679bf 100644
--- a/src/widgets/kernel/qwidget_qpa.cpp
+++ b/src/widgets/kernel/qwidget_qpa.cpp
@@ -96,6 +96,12 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
     win->setWindowFlags(data.window_flags);
     win->setGeometry(q->geometry());
 
+    if (q->testAttribute(Qt::WA_TranslucentBackground)) {
+        QWindowFormat format = win->requestedWindowFormat();
+        format.setAlphaBufferSize(8);
+        win->setWindowFormat(format);
+    }
+
     if (QWidget *nativeParent = q->nativeParentWidget()) {
         if (nativeParent->windowHandle())
             win->setParent(nativeParent->windowHandle());
@@ -396,6 +402,7 @@ void QWidgetPrivate::show_sys()
                 surface->resize(geomRect.size());
             }
         }
+
         if (window)
             window->setVisible(true);
     }