diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-05 09:58:24 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-05 09:59:59 +0100 |
| commit | b36c5bdc30040b5100da2a003056d3519972e178 (patch) | |
| tree | 952e951bef0add6ee0ff0046c018d663568f9953 /src/gui/kernel | |
| parent | 47869340b97686a4bf852f94edc3bae1e50d7053 (diff) | |
| parent | c9d18d4a9c9d1243a267316e2a702f9ba69de2fd (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12.0
Conflicts:
src/plugins/platforms/cocoa/qcocoaglcontext.mm
src/plugins/platforms/xcb/qxcbscreen.h
Change-Id: If9b4c67288396ff7346088ce591c7a3588b51979
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); } |