diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-11-05 12:49:22 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-11-05 12:49:22 +0000 |
| commit | d24835a60c0c620a27c7a9830b89ed47312739a5 (patch) | |
| tree | 5bd2d865c2f1c93246b1d19a631f1a9581513d0e /src/gui/kernel | |
| parent | 60197af4850e13409f26551ce812e866602e6926 (diff) | |
| parent | b36c5bdc30040b5100da2a003056d3519972e178 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into 5.12.0" into refs/staging/5.12.0v5.12.0-beta4
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 0e35fb7d7b..53d1ac1fc0 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -2533,6 +2533,7 @@ QTabletEvent::QTabletEvent(Type type, const QPointF &pos, const QPointF &globalP */ QTabletEvent::~QTabletEvent() { + delete static_cast<QTabletEventPrivate *>(mExtra); } /*! diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index e5657000cf..f4e2dda05a 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -803,7 +803,8 @@ static void updateBlockedStatusRecursion(QWindow *window, bool shouldBeBlocked) void QGuiApplicationPrivate::updateBlockedStatus(QWindow *window) { bool shouldBeBlocked = false; - if (!QWindowPrivate::get(window)->isPopup() && !self->modalWindowList.isEmpty()) + const bool popupType = (window->type() == Qt::ToolTip) || (window->type() == Qt::Popup); + if (!popupType && !self->modalWindowList.isEmpty()) shouldBeBlocked = self->isWindowBlocked(window); updateBlockedStatusRecursion(window, shouldBeBlocked); } |