diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2017-05-26 15:02:50 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2017-06-28 14:49:28 +0000 |
| commit | 38df72713c4c4c5b4aae93ac5bcb92b86d380a8f (patch) | |
| tree | 0c9a50ae7d6d15ac04e8a314ccfdd5c1e5a1280c /src/quicktemplates2/qquickshortcutcontext.cpp | |
| parent | 037fe9c5c9214f682e6a91c3f8a359770488b030 (diff) | |
Fix tooltips to not block shortcuts
Task-number: QTBUG-60492
Change-Id: Ic1f380f44593d4a8681bff874789692d17b9edf7
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickshortcutcontext.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickshortcutcontext.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickshortcutcontext.cpp b/src/quicktemplates2/qquickshortcutcontext.cpp index 978d1869..6553beb4 100644 --- a/src/quicktemplates2/qquickshortcutcontext.cpp +++ b/src/quicktemplates2/qquickshortcutcontext.cpp @@ -36,6 +36,7 @@ #include "qquickshortcutcontext_p_p.h" #include "qquickoverlay_p_p.h" +#include "qquicktooltip_p.h" #include "qquickpopup_p.h" #include <QtGui/qguiapplication.h> @@ -50,6 +51,8 @@ static bool isBlockedByPopup(QQuickItem *item) QQuickOverlay *overlay = QQuickOverlay::overlay(item->window()); const auto popups = QQuickOverlayPrivate::get(overlay)->stackingOrderPopups(); for (QQuickPopup *popup : popups) { + if (qobject_cast<QQuickToolTip *>(popup)) + continue; // ignore tooltips (QTBUG-60492) if (popup->isModal() || popup->closePolicy() & QQuickPopup::CloseOnEscape) return item != popup->popupItem() && !popup->popupItem()->isAncestorOf(item); } |