From 4ce80b299ccc805b08c1c0227adda92049a2187e Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 21 Oct 2016 21:36:53 +0200 Subject: Fix Shortcut to respect modal popups In the Gallery example, the back navigation shortcut no longer activates when the settings dialog or the about dialog is open. Notice that the back navigation shortcut still activates while the options menu is open. [ChangeLog][Controls][Popup] The QML Shortcut type from QtQuick has been fixed to respect modal popups from QtQuick Controls 2. Task-number: QTBUG-56562 Change-Id: I4c3c762e9db0935ef250ff9f8c553e7d211220c7 Reviewed-by: Mitch Curtis Reviewed-by: Qt CI Bot --- src/quicktemplates2/quicktemplates2.pri | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/quicktemplates2/quicktemplates2.pri') diff --git a/src/quicktemplates2/quicktemplates2.pri b/src/quicktemplates2/quicktemplates2.pri index 0a9d2fd5..5877b3d0 100644 --- a/src/quicktemplates2/quicktemplates2.pri +++ b/src/quicktemplates2/quicktemplates2.pri @@ -42,6 +42,7 @@ HEADERS += \ $$PWD/qquickrangeslider_p.h \ $$PWD/qquickscrollbar_p.h \ $$PWD/qquickscrollindicator_p.h \ + $$PWD/qquickshortcutcontext_p_p.h \ $$PWD/qquickslider_p.h \ $$PWD/qquickspinbox_p.h \ $$PWD/qquickstackview_p.h \ @@ -93,6 +94,7 @@ SOURCES += \ $$PWD/qquickrangeslider.cpp \ $$PWD/qquickscrollbar.cpp \ $$PWD/qquickscrollindicator.cpp \ + $$PWD/qquickshortcutcontext.cpp \ $$PWD/qquickslider.cpp \ $$PWD/qquickspinbox.cpp \ $$PWD/qquickstackview.cpp \ -- cgit v1.2.3