Menu: fix key navigation on Windows

Do not force Qt::PopupFocusReason but let QGuiApp
processActivatedEvent() check the window flags and
do the right thing.

Task-number: QTBUG-41935
Change-Id: Ic97c1d3a7f42a67e43d34b0c035c10d1e26412d7
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/controls/qquickpopupwindow.cpp b/src/controls/qquickpopupwindow.cpp
index cef7519d..70b27758 100644
--- a/src/controls/qquickpopupwindow.cpp
+++ b/src/controls/qquickpopupwindow.cpp
@@ -191,11 +191,11 @@ void QQuickPopupWindow::exposeEvent(QExposeEvent *e)
 {
     if (isExposed() && m_needsActivatedEvent) {
         m_needsActivatedEvent = false;
-        QWindowSystemInterface::handleWindowActivated(this, Qt::PopupFocusReason);
+        QWindowSystemInterface::handleWindowActivated(this);
     } else if (!isExposed() && !m_needsActivatedEvent) {
         m_needsActivatedEvent = true;
         if (QWindow *tp = transientParent())
-            QWindowSystemInterface::handleWindowActivated(tp, Qt::PopupFocusReason);
+            QWindowSystemInterface::handleWindowActivated(tp);
     }
     QQuickWindow::exposeEvent(e);
 }
@@ -204,7 +204,7 @@ void QQuickPopupWindow::hideEvent(QHideEvent *e)
 {
     if (QWindow *tp = !m_needsActivatedEvent ? transientParent() : 0) {
         m_needsActivatedEvent = true;
-        QWindowSystemInterface::handleWindowActivated(tp, Qt::PopupFocusReason);
+        QWindowSystemInterface::handleWindowActivated(tp);
     }
 
     QQuickWindow::hideEvent(e);