diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/kernel/qevent.cpp | 5 | ||||
-rw-r--r-- | src/gui/kernel/qevent.h | 1 | ||||
-rw-r--r-- | src/widgets/kernel/qwidgetwindow.cpp | 7 |
3 files changed, 4 insertions, 9 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index b1ad2753fe..fe1a748cbe 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -3989,10 +3989,7 @@ QDebug operator<<(QDebug dbg, const QEvent *e) bool isMouse = false; switch (type) { case QEvent::Expose: -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - dbg << "QExposeEvent(" << static_cast<const QExposeEvent *>(e)->region() << ')'; -QT_WARNING_POP + dbg << "QExposeEvent()"; break; case QEvent::Paint: dbg << "QPaintEvent(" << static_cast<const QPaintEvent *>(e)->region() << ')'; diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 983cc6a9da..7bca2b2931 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -520,6 +520,7 @@ public: protected: QRegion m_region; + friend class QWidgetWindow; }; class Q_GUI_EXPORT QPlatformSurfaceEvent : public QEvent diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp index c1fcdbb2dd..61dfa5b2f1 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp @@ -1002,11 +1002,8 @@ void QWidgetWindow::handleExposeEvent(QExposeEvent *event) m_widget->setAttribute(Qt::WA_Mapped); for (QWidget *p = m_widget->parentWidget(); p && !p->testAttribute(Qt::WA_Mapped); p = p->parentWidget()) p->setAttribute(Qt::WA_Mapped); -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - if (!event->region().isNull()) - wPriv->syncBackingStore(event->region()); -QT_WARNING_POP + if (!event->m_region.isNull()) + wPriv->syncBackingStore(event->m_region); } else { m_widget->setAttribute(Qt::WA_Mapped, false); } |