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

Conflicts:
	configure
	configure.json

Change-Id: Iba032d9a29c273da2585632bc6e22bbafb961808

2 files changed, 10 insertions, 0 deletions

diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index 063778a1de..c5cc2cd790 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -2102,6 +2102,15 @@ void QXcbWindow::handleConfigureNotifyEvent(const xcb_configure_notify_event_t *
     // will make the comparison later.
     QWindowSystemInterface::handleWindowScreenChanged(window(), newScreen->screen());
 
+    // Send the synthetic expose event on resize only when the window is shrinked,
+    // because the "XCB_GRAVITY_NORTH_WEST" flag doesn't send it automatically.
+    if (!m_oldWindowSize.isEmpty()
+            && (actualGeometry.width() < m_oldWindowSize.width()
+                || actualGeometry.height() < m_oldWindowSize.height())) {
+        QWindowSystemInterface::handleExposeEvent(window(), QRegion(0, 0, actualGeometry.width(), actualGeometry.height()));
+    }
+    m_oldWindowSize = actualGeometry.size();
+
     if (m_usingSyncProtocol && m_syncState == SyncReceived)
         m_syncState = SyncAndConfigureReceived;
 
diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h
index 9ad0153ca2..e7190b1733 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.h
+++ b/src/plugins/platforms/xcb/qxcbwindow.h
@@ -256,6 +256,7 @@ protected:
     mutable QMargins m_frameMargins;
 
     QRegion m_exposeRegion;
+    QSize m_oldWindowSize;
 
     xcb_visualid_t m_visualId;
     int m_lastWindowStateEvent;