Author: Zhang Hao <zhanghao@uniontech.com>
Date:   Wed Apr 7 11:10:57 2021 +0800
Subject: QMenu is scrollable should not reset activeAction
Upstream: https://codereview.qt-project.org/c/qt/qtbase/+/340546
---

Index: qtbase-opensource-src/src/widgets/widgets/qmenu.cpp
===================================================================
--- qtbase-opensource-src.orig/src/widgets/widgets/qmenu.cpp
+++ qtbase-opensource-src/src/widgets/widgets/qmenu.cpp
@@ -2237,7 +2237,7 @@ void QMenu::setActiveAction(QAction *act
 {
     Q_D(QMenu);
     d->setCurrentAction(act, 0);
-    if (d->scroll)
+    if (d->scroll && act)
         d->scrollMenu(act, QMenuPrivate::QMenuScroller::ScrollCenter);
 }