summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDebao Zhang <dbzhang800@gmail.com>2012-06-01 03:36:32 -0700
committerQt by Nokia <qt-info@nokia.com>2012-06-04 09:08:21 +0200
commit3892ccaca7d16ba056bf7c91cc15522bcf3754a3 (patch)
tree6e03118745186a45f7fca3e66cd64412c8343ad3
parent2268be804057f655e009d3d99dfdca83c9d469b0 (diff)
QWidgetWindow: Fix handleExposeEvent()
When the associated widget of QWidgetWindow is visible but its updates are not enabled, avoid marking the widget dirty. Task-number: QTBUG-25991 Change-Id: Ibeac4c0dfd3198a5174372331e50628b0d3a480d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
-rw-r--r--src/widgets/kernel/qwidgetwindow_qpa.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwidgetwindow_qpa.cpp b/src/widgets/kernel/qwidgetwindow_qpa.cpp
index 3b1d69e46d..21a0ada831 100644
--- a/src/widgets/kernel/qwidgetwindow_qpa.cpp
+++ b/src/widgets/kernel/qwidgetwindow_qpa.cpp
@@ -474,7 +474,7 @@ void QWidgetWindow::handleExposeEvent(QExposeEvent *event)
m_widget->setAttribute(Qt::WA_Mapped);
if (!event->region().isNull()) {
// Exposed native widgets need to be marked dirty to get them repainted correctly.
- if (m_widget->internalWinId() && !m_widget->isWindow()) {
+ if (m_widget->internalWinId() && !m_widget->isWindow() && m_widget->updatesEnabled()) {
if (QWidgetBackingStore *bs = m_widget->d_func()->maybeBackingStore())
bs->markDirty(event->region(), m_widget);
}