path: root/src
diff options
authorElvis Angelaccio <>2017-07-29 11:28:13 +0200
committerElvis Angelaccio <>2017-11-04 17:41:17 +0000
commita4f9cf23444dd76a11d4eb67c4ea65d5c3948894 (patch)
tree287e421ae943b6a564f268cefcfcbe2950805a04 /src
parent8f1277da8c137270ff857128d8fea1423d8a7700 (diff)
Disable window shortcuts if there is a window modal dialog
If a window is blocked by a WindowModal dialog, it should not be possible to trigger window shortcuts on that window if it receives a WindowActivate event. This currently happens if the blocked window gets clicked, because the window becomes the active_window and then QApplication sends it a WindowActivate event (this doesn't happen with application modal dialogs). The correctWidgetContext() function calls QApplicationPrivate::tryModalHelper() only if the shortcut context is ApplicationShortcut. This patch makes it call even if the shortcut context is WindowShortcut. Change-Id: Iff87d85bcae603a6a24128e0cedfa9d33b6485fd Reviewed-by: Richard Moe Gustavsen <>
Diffstat (limited to 'src')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/kernel/qshortcut.cpp b/src/widgets/kernel/qshortcut.cpp
index f944a7097b..32600d4152 100644
--- a/src/widgets/kernel/qshortcut.cpp
+++ b/src/widgets/kernel/qshortcut.cpp
@@ -205,7 +205,7 @@ static bool correctWidgetContext(Qt::ShortcutContext context, QWidget *w, QWidge
qDebug().nospace() << "..true [Pass-through]";
- return true;
+ return QApplicationPrivate::tryModalHelper(w, nullptr);
#if QT_CONFIG(graphicsview)