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

Conflicts:
	src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
	src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp
	tools/configure/configureapp.cpp

Change-Id: I3092bd3276af14304b7ab3ae1e1cc05d11cdede0

1 files changed, 6 insertions, 0 deletions

diff --git a/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp b/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp
index 17b0d06245..1da3cd5446 100644
--- a/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp
+++ b/src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp
@@ -81,6 +81,12 @@ void QQnxRasterBackingStore::flush(QWindow *window, const QRegion &region, const
 {
     qRasterBackingStoreDebug() << Q_FUNC_INFO << "w =" << this->window();
 
+    // Sometimes this method is called even though there is nothing to be
+    // flushed, for instance, after an expose event directly follows a
+    // geometry change event.
+    if (!m_hasUnflushedPaintOperations)
+            return;
+
     QQnxWindow *targetWindow = 0;
     if (window)
         targetWindow = static_cast<QQnxWindow *>(window->handle());