diff --git a/addons/project/kateprojecttreeviewcontextmenu.cpp b/addons/project/kateprojecttreeviewcontextmenu.cpp
index 7b49f2901..a213be950 100644
--- a/addons/project/kateprojecttreeviewcontextmenu.cpp
+++ b/addons/project/kateprojecttreeviewcontextmenu.cpp
@@ -1,130 +1,132 @@
 /*  This file is part of the Kate project.
  *
  *  Copyright (C) 2013 Dominik Haumann <dhaumann.org>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *  Library General Public License for more details.
  *
  *  You should have received a copy of the GNU Library General Public License
  *  along with this library; see the file COPYING.LIB.  If not, write to
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  */
 
 #include "kateprojecttreeviewcontextmenu.h"
 
 #include <klocalizedstring.h>
 #include <KMimeTypeTrader>
 #include <KRun>
 #include <KNS3/KMoreTools>
 #include <KNS3/KMoreToolsMenuFactory>
 
 #include <QMenu>
 #include <QStandardPaths>
 #include <QFileInfo>
 #include <QDir>
 #include <QIcon>
 #include <QProcess>
 #include <QApplication>
 #include <QClipboard>
 #include <QMimeType>
 #include <QMimeDatabase>
 
 KateProjectTreeViewContextMenu::KateProjectTreeViewContextMenu()
 {
 }
 
 KateProjectTreeViewContextMenu::~KateProjectTreeViewContextMenu()
 {
 }
 
 static bool isGit(const QString &filename)
 {
     QFileInfo fi(filename);
     QDir dir(fi.absoluteDir());
     QProcess git;
     git.setWorkingDirectory(dir.absolutePath());
     QStringList args;
     args << QStringLiteral("ls-files") << fi.fileName();
     git.start(QStringLiteral("git"), args);
     bool isGit = false;
     if (git.waitForStarted() && git.waitForFinished()) {
         QStringList files = QString::fromLocal8Bit(git.readAllStandardOutput()).split(QRegExp(QStringLiteral("[\n\r]")), QString::SkipEmptyParts);
         isGit = files.contains(fi.fileName());
     }
     return isGit;
 }
 
 void KateProjectTreeViewContextMenu::exec(const QString &filename, const QPoint &pos, QWidget *parent)
 {
     /**
      * create context menu
      */
     QMenu menu;
 
     QAction *copyAction = menu.addAction(QIcon::fromTheme(QStringLiteral("edit-copy")), i18n("Copy Filename"));
 
     /**
      * handle "open with"
      * find correct mimetype to query for possible applications
      */
     QMenu *openWithMenu = menu.addMenu(i18n("Open With"));
     QMimeType mimeType = QMimeDatabase().mimeTypeForFile(filename);
     KService::List offers = KMimeTypeTrader::self()->query(mimeType.name(), QStringLiteral("Application"));
 
     /**
      * for each one, insert a menu item...
      */
     for (KService::List::Iterator it = offers.begin(); it != offers.end(); ++it) {
         KService::Ptr service = *it;
         if (service->name() == QStringLiteral("Kate")) {
             continue;    // omit Kate
         }
         QAction *action = openWithMenu->addAction(QIcon::fromTheme(service->icon()), service->name());
         action->setData(service->entryPath());
     }
 
     /**
      * perhaps disable menu, if no entries!
      */
     openWithMenu->setEnabled(!openWithMenu->isEmpty());
 
     KMoreToolsMenuFactory menuFactory(QLatin1String("kate/addons/project/git-tools"));
 
+    QMenu gitMenu; // must live as long as the maybe filled menu items should live
+
     if (isGit(filename)) {
 
-        auto gitMenu = menuFactory.createMenuFromGroupingNames({ QLatin1String("git-clients-and-actions") },
+        menuFactory.fillMenuFromGroupingNames(&gitMenu, { QLatin1String("git-clients-and-actions") },
                                                                QUrl::fromLocalFile(filename));
 
         menu.addSection(i18n("Git:"));
-        Q_FOREACH(auto action, gitMenu->actions()) {
+        Q_FOREACH(auto action, gitMenu.actions()) {
             menu.addAction(action);
         }
     }
 
     /**
      * run menu and handle the triggered action
      */
     if (QAction *action = menu.exec(pos)) {
 
         // handle apps
         if (copyAction == action) {
             QApplication::clipboard()->setText(filename);
         } else {
             // handle "open with"
             const QString openWith = action->data().toString();
             if (KService::Ptr app = KService::serviceByDesktopPath(openWith)) {
                 QList<QUrl> list;
                 list << QUrl::fromLocalFile(filename);
                 KRun::runService(*app, list, parent);
             }
         }
     }
 }