From e10a438a90b369c894b5f39cc1ab61ae68ff200c Mon Sep 17 00:00:00 2001
From: Fabien Freling <fabien.freling@nokia.com>
Date: Wed, 26 Jan 2011 16:29:28 +0100
Subject: Force the display: in the unified toolbar.

Instead of calling setNeedsDisplay:, we call have
to call display: to avoid flickering.

Reviewed-by: Richard Moe Gustavsen
---
 src/gui/painting/qunifiedtoolbarsurface_mac.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
index 4c027f8..5f52679 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
@@ -141,7 +141,9 @@ void QUnifiedToolbarSurface::flush(QWidget *widget, const QRegion &rgn, const QP
         return;
 
     widget->d_func()->flushRequested = true;
-    qt_mac_setneedsdisplay(widget);
+
+    // We call display: directly to avoid flickering in the toolbar.
+    qt_mac_display(widget);
 }
 
 void QUnifiedToolbarSurface::prepareBuffer(QImage::Format format, QWidget *widget)
-- 
cgit v0.12