From 536d695a08daafab4b5b0396120bcf394a531d18 Mon Sep 17 00:00:00 2001
From: Nate Graham <nate@kde.org>
Date: Mon, 2 May 2022 14:07:03 -0600
Subject: [PATCH] Revert "[Global Menu] Respect toplevel menu action
 visibility"

This reverts commit 0b938e5ffb5a8a299c9bbca5d621a8fc8f737feb.

This change broke the global menu, causing
https://bugs.kde.org/show_bug.cgi?id=453301.

Reverting for now so it doesn't end up in a release before we can fix
it.
---
 applets/appmenu/package/contents/ui/main.qml | 2 +-
 applets/appmenu/plugin/appmenumodel.cpp      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/applets/appmenu/package/contents/ui/main.qml b/applets/appmenu/package/contents/ui/main.qml
index f17896544..8a3d85802 100644
--- a/applets/appmenu/package/contents/ui/main.qml
+++ b/applets/appmenu/package/contents/ui/main.qml
@@ -114,7 +114,7 @@ Item {
 
                 down: pressed || plasmoid.nativeInterface.currentIndex === index
 
-                visible: text !== "" && model.activeActions.visible
+                visible: text !== ""
                 onClicked: {
                     plasmoid.nativeInterface.trigger(this, index)
 
diff --git a/applets/appmenu/plugin/appmenumodel.cpp b/applets/appmenu/plugin/appmenumodel.cpp
index c4eaa6b49..3ce29e3f5 100644
--- a/applets/appmenu/plugin/appmenumodel.cpp
+++ b/applets/appmenu/plugin/appmenumodel.cpp
@@ -242,7 +242,7 @@ QVariant AppMenuModel::data(const QModelIndex &index, int role) const
         if (role == MenuRole) {
             return QString();
         } else if (role == ActionRole) {
-            return QVariant::fromValue(m_menu->menuAction());
+            return QVariant::fromValue((void *)(m_menu->menuAction()));
         }
     }
 
@@ -262,7 +262,7 @@ QVariant AppMenuModel::data(const QModelIndex &index, int role) const
     if (role == MenuRole) { // TODO this should be Qt::DisplayRole
         return actions.at(row)->text();
     } else if (role == ActionRole) {
-        return QVariant::fromValue(actions.at(row));
+        return QVariant::fromValue((void *)actions.at(row));
     }
 
     return QVariant();