summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qrasterwindow.cpp
diff options
context:
space:
mode:
authorLiang Qi <[email protected]>2016-03-22 07:24:57 +0100
committerLiang Qi <[email protected]>2016-03-22 07:28:42 +0100
commita02863234d76abb6c9f289026ae4ea3145924f30 (patch)
treeaef6381d0000a78ba69ac80eb03739b1c8ca5fc3 /src/gui/kernel/qrasterwindow.cpp
parente77b13621f0057374d83a2b884f03dd2e5b7b88c (diff)
parente4d79e1fdeb6b26ba0b12b578daacf7cd672b960 (diff)
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts: configure mkspecs/common/wince/qplatformdefs.h src/plugins/platforms/directfb/qdirectfbbackingstore.cpp src/plugins/platforms/xcb/qxcbbackingstore.cpp Change-Id: Ied4d31264a9afca9514b51a7eb1494c28712793c
Diffstat (limited to 'src/gui/kernel/qrasterwindow.cpp')
-rw-r--r--src/gui/kernel/qrasterwindow.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/kernel/qrasterwindow.cpp b/src/gui/kernel/qrasterwindow.cpp
index 947f2bb6a8f..d8d448249e9 100644
--- a/src/gui/kernel/qrasterwindow.cpp
+++ b/src/gui/kernel/qrasterwindow.cpp
@@ -73,8 +73,9 @@ public:
void beginPaint(const QRegion &region) Q_DECL_OVERRIDE
{
Q_Q(QRasterWindow);
- if (backingstore->size() != q->size()) {
- backingstore->resize(q->size());
+ const QSize size = q->size();
+ if (backingstore->size() != size) {
+ backingstore->resize(size);
markWindowAsDirty();
}
backingstore->beginPaint(region);