summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-10 05:25:33 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-10 05:25:33 (GMT)
commitb18bd68dd05f000c65e33a975bca6bf24dabb8d3 (patch)
treee8f44ce1d7ecb5d22212ad5989df4d2759ba22ff
parent1f5232d0eb8a06ce2bd1b367480f61a109bcfe61 (diff)
parent09ff8924d5d05b285d9ed6a03817bdf271b6b108 (diff)
downloadQt-b18bd68dd05f000c65e33a975bca6bf24dabb8d3.zip
Qt-b18bd68dd05f000c65e33a975bca6bf24dabb8d3.tar.gz
Qt-b18bd68dd05f000c65e33a975bca6bf24dabb8d3.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Partial update window surfaces always need a repaint before flush.
-rw-r--r--src/gui/painting/qbackingstore.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp
index 83c58c4..4fcff1d 100644
--- a/src/gui/painting/qbackingstore.cpp
+++ b/src/gui/painting/qbackingstore.cpp
@@ -1117,6 +1117,11 @@ void QWidgetBackingStore::sync(QWidget *exposedWidget, const QRegion &exposedReg
return;
}
+ // If there's no partial update support we always need
+ // to do a full repaint before flushing
+ if (!windowSurface->hasPartialUpdateSupport())
+ fullUpdatePending = true;
+
// Nothing to repaint.
if (!isDirty()) {
qt_flush(exposedWidget, exposedRegion, windowSurface, tlw, tlwOffset);