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();