From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Date: Sat, 25 Apr 2020 11:18:10 +0000 (+0200)
Subject: Merge branch 'master' into menuaction
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~267^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=061ca2d713a67a5e20c54ba4c064d50399780777;p=nextcloud-desktop.git

Merge branch 'master' into menuaction
---

061ca2d713a67a5e20c54ba4c064d50399780777
diff --cc shell_integration/dolphin/ownclouddolphinactionplugin.cpp
index c8f918586,992e14b81..4e5966e7f
--- a/shell_integration/dolphin/ownclouddolphinactionplugin.cpp
+++ b/shell_integration/dolphin/ownclouddolphinactionplugin.cpp
@@@ -90,9 -90,12 +90,10 @@@ public
              delete menu;
              return {};
          }
--
 -        auto menuaction = new QAction(parentWidget);
 -        menuaction->setText(helper->contextMenuTitle());
 -        menuaction->setIcon(QIcon::fromTheme(helper->contextMenuIconName()));
 -        menuaction->setMenu(menu);
 -        return { menuaction };
++        
 +        menu->setTitle(helper->contextMenuTitle());
++        menu->setIcon(QIcon::fromTheme(helper->contextMenuIconName()));
 +        return { menu->menuAction() };
      }