diff --git a/addons/kate-ctags/kate_ctags_view.cpp b/addons/kate-ctags/kate_ctags_view.cpp
index b39bdd62b..f8a5573ac 100644
--- a/addons/kate-ctags/kate_ctags_view.cpp
+++ b/addons/kate-ctags/kate_ctags_view.cpp
@@ -1,614 +1,638 @@
 /* Description : Kate CTags plugin
  *
  * Copyright (C) 2008-2011 by Kare Sars <kare.sars@iki.fi>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) version 3, or any
  * later version accepted by the membership of KDE e.V. (or its
  * successor approved by the membership of KDE e.V.), which shall
  * act as a proxy defined in Section 6 of version 3 of the license.
  *
  * This program 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
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "kate_ctags_view.h"
+#include "kate_ctags_plugin.h"
 #include "kate_ctags_debug.h"
 
 #include <QFileInfo>
 #include <QFileDialog>
 #include <QKeyEvent>
 
 #include <KXMLGUIFactory>
 #include <KActionCollection>
 #include <KConfigGroup>
 #include <QMenu>
 
 #include <klocalizedstring.h>
 #include <kstringhandler.h>
 #include <kmessagebox.h>
 #include <QStandardPaths>
 
 /******************************************************************/
 KateCTagsView::KateCTagsView(KTextEditor::Plugin *plugin, KTextEditor::MainWindow *mainWin)
 : QObject(mainWin)
 , m_proc(nullptr)
 {
     KXMLGUIClient::setComponentName (QLatin1String("katectags"), i18n ("Kate CTag"));
     setXMLFile( QLatin1String("ui.rc") );
 
     m_toolView = mainWin->createToolView(plugin, QLatin1String("kate_plugin_katectagsplugin"),
                                         KTextEditor::MainWindow::Bottom,
                                         QIcon::fromTheme(QStringLiteral("application-x-ms-dos-executable")),
                                         i18n("CTags"));
     m_mWin = mainWin;
 
     QAction *back = actionCollection()->addAction(QLatin1String("ctags_return_step"));
     back->setText(i18n("Jump back one step"));
     connect(back, &QAction::triggered, this, &KateCTagsView::stepBack);
 
     QAction *decl = actionCollection()->addAction(QLatin1String("ctags_lookup_current_as_declaration"));
     decl->setText(i18n("Go to Declaration"));
     connect(decl, &QAction::triggered, this, &KateCTagsView::gotoDeclaration);
 
     QAction *defin = actionCollection()->addAction(QLatin1String("ctags_lookup_current_as_definition"));
     defin->setText(i18n("Go to Definition"));
     connect(defin, &QAction::triggered, this, &KateCTagsView::gotoDefinition);
 
     QAction *lookup = actionCollection()->addAction(QLatin1String("ctags_lookup_current"));
     lookup->setText(i18n("Lookup Current Text"));
     connect(lookup, &QAction::triggered, this, &KateCTagsView::lookupTag);
 
+    QAction *updateDB = actionCollection()->addAction(QLatin1String("ctags_update_global_db"));
+    updateDB->setText(i18n("Configure ..."));
+    connect(updateDB, &QAction::triggered, this, [this, plugin] (bool) {
+        if (m_mWin) {
+            KateCTagsPlugin *p = static_cast<KateCTagsPlugin*>(plugin);
+            QDialog *confWin = new QDialog(m_mWin->window());
+            confWin->setAttribute(Qt::WA_DeleteOnClose);
+            auto confPage = p->configPage(0, confWin);
+            auto controls = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel, Qt::Horizontal, confWin);
+            connect(confWin, &QDialog::accepted, confPage, &KTextEditor::ConfigPage::apply);
+            connect(controls, &QDialogButtonBox::accepted, confWin, &QDialog::accept);
+            connect(controls, &QDialogButtonBox::rejected, confWin, &QDialog::reject);
+            auto layout = new QVBoxLayout(confWin);
+            layout->addWidget(confPage);
+            layout->addWidget(controls);
+            confWin->setLayout(layout);
+            confWin->show();
+            confWin->exec();
+        }
+    });
+
     // popup menu
     m_menu = new KActionMenu(i18n("CTags"), this);
     actionCollection()->addAction(QLatin1String("popup_ctags"), m_menu);
 
     m_gotoDec=m_menu->menu()->addAction(i18n("Go to Declaration: %1",QString()), this, SLOT(gotoDeclaration()));
     m_gotoDef=m_menu->menu()->addAction(i18n("Go to Definition: %1",QString()), this, SLOT(gotoDefinition()));
     m_lookup=m_menu->menu()->addAction(i18n("Lookup: %1",QString()), this, SLOT(lookupTag()));
 
     connect(m_menu->menu(), &QMenu::aboutToShow, this, &KateCTagsView::aboutToShow);
 
     QWidget *ctagsWidget = new QWidget(m_toolView);
     m_ctagsUi.setupUi(ctagsWidget);
     m_ctagsUi.cmdEdit->setText(DEFAULT_CTAGS_CMD);
 
     m_ctagsUi.addButton->setToolTip(i18n("Add a directory to index."));
     m_ctagsUi.addButton->setIcon(QIcon::fromTheme(QStringLiteral("list-add")));
 
     m_ctagsUi.delButton->setToolTip(i18n("Remove a directory."));
     m_ctagsUi.delButton->setIcon(QIcon::fromTheme(QStringLiteral("list-remove")));
 
     m_ctagsUi.updateButton->setToolTip(i18n("(Re-)generate the session specific CTags database."));
     m_ctagsUi.updateButton->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh")));
 
     m_ctagsUi.updateButton2->setToolTip(i18n("(Re-)generate the session specific CTags database."));
     m_ctagsUi.updateButton2->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh")));
 
     m_ctagsUi.resetCMD->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh")));
 
     m_ctagsUi.tagsFile->setToolTip(i18n("Select new or existing database file."));
     m_ctagsUi.tagsFile->setMode(KFile::File);
 
     connect(m_ctagsUi.resetCMD, &QToolButton::clicked, this, &KateCTagsView::resetCMD);
     connect(m_ctagsUi.addButton, &QPushButton::clicked, this, &KateCTagsView::addTagTarget);
     connect(m_ctagsUi.delButton, &QPushButton::clicked, this, &KateCTagsView::delTagTarget);
     connect(m_ctagsUi.updateButton, &QPushButton::clicked, this, &KateCTagsView::updateSessionDB);
     connect(m_ctagsUi.updateButton2, &QPushButton::clicked, this, &KateCTagsView::updateSessionDB);
     connect(&m_proc, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
             this, &KateCTagsView::updateDone);
 
     connect(m_ctagsUi.inputEdit, &QLineEdit::textChanged, this, &KateCTagsView::startEditTmr);
 
     m_editTimer.setSingleShot(true);
     connect(&m_editTimer, &QTimer::timeout, this, &KateCTagsView::editLookUp);
 
     connect(m_ctagsUi.tagTreeWidget, &QTreeWidget::itemActivated, this, &KateCTagsView::tagHitClicked);
 
     connect(m_mWin, &KTextEditor::MainWindow::unhandledShortcutOverride, this, &KateCTagsView::handleEsc);
 
     m_toolView->installEventFilter(this);
 
     m_mWin->guiFactory()->addClient(this);
 
     m_commonDB = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/katectags/common_db");
 }
 
 
 /******************************************************************/
 KateCTagsView::~KateCTagsView()
 {
-    m_mWin->guiFactory()->removeClient( this );
+    if (m_mWin && m_mWin->guiFactory()) {
+        m_mWin->guiFactory()->removeClient( this );
+    }
 
     delete m_toolView;
 }
 
 /******************************************************************/
 void KateCTagsView::aboutToShow()
 {
     QString currWord = currentWord();
     if (currWord.isEmpty()) {
         return;
     }
 
     if (Tags::hasTag(m_commonDB, currWord) || Tags::hasTag(m_ctagsUi.tagsFile->text(), currWord)) {
         QString squeezed = KStringHandler::csqueeze(currWord, 30);
 
         m_gotoDec->setText(i18n("Go to Declaration: %1",squeezed));
         m_gotoDef->setText(i18n("Go to Definition: %1",squeezed));
         m_lookup->setText(i18n("Lookup: %1",squeezed));
     }
 }
 
 
 /******************************************************************/
 void KateCTagsView::readSessionConfig (const KConfigGroup& cg)
 {
     m_ctagsUi.cmdEdit->setText(cg.readEntry("TagsGenCMD", DEFAULT_CTAGS_CMD));
 
     int numEntries = cg.readEntry("SessionNumTargets", 0);
     QString nr;
     QString target;
     for (int i=0; i<numEntries; i++) {
         nr = QStringLiteral("%1").arg(i,3);
         target = cg.readEntry(QStringLiteral("SessionTarget_%1").arg(nr), QString());
         if (!listContains(target)) {
             new QListWidgetItem(target, m_ctagsUi.targetList);
         }
     }
 
     QString sessionDB = cg.readEntry("SessionDatabase", QString());
     m_ctagsUi.tagsFile->setText(sessionDB);
 
 }
 
 /******************************************************************/
 void KateCTagsView::writeSessionConfig (KConfigGroup& cg)
 {
     cg.writeEntry("TagsGenCMD", m_ctagsUi.cmdEdit->text());
     cg.writeEntry("SessionNumTargets", m_ctagsUi.targetList->count());
 
     QString nr;
     for (int i=0; i<m_ctagsUi.targetList->count(); i++) {
         nr = QStringLiteral("%1").arg(i,3);
         cg.writeEntry(QStringLiteral("SessionTarget_%1").arg(nr), m_ctagsUi.targetList->item(i)->text());
     }
 
     cg.writeEntry("SessionDatabase", m_ctagsUi.tagsFile->text());
 
     cg.sync();
 }
 
 
 /******************************************************************/
 void KateCTagsView::stepBack()
 {
     if (m_jumpStack.isEmpty()) {
         return;
     }
 
     TagJump back;
     back = m_jumpStack.pop();
 
     m_mWin->openUrl(back.url);
     m_mWin->activeView()->setCursorPosition(back.cursor);
     m_mWin->activeView()->setFocus();
 
 }
 
 
 /******************************************************************/
 void KateCTagsView::lookupTag( )
 {
     QString currWord = currentWord();
     if (currWord.isEmpty()) {
         return;
     }
 
     setNewLookupText(currWord);
     Tags::TagList list = Tags::getExactMatches(m_ctagsUi.tagsFile->text(), currWord);
     if (list.size() == 0) list = Tags::getExactMatches(m_commonDB, currWord);
     displayHits(list);
 
     // activate the hits tab
     m_ctagsUi.tabWidget->setCurrentIndex(0);
     m_mWin->showToolView(m_toolView);
 }
 
 /******************************************************************/
 void KateCTagsView::editLookUp()
 {
     Tags::TagList list = Tags::getPartialMatches(m_ctagsUi.tagsFile->text(), m_ctagsUi.inputEdit->text());
     if (list.size() == 0) list = Tags::getPartialMatches(m_commonDB, m_ctagsUi.inputEdit->text());
     displayHits(list);
 }
 
 /******************************************************************/
 void KateCTagsView::gotoDefinition( )
 {
     QString currWord = currentWord();
     if (currWord.isEmpty()) {
         return;
     }
 
     QStringList types;
     types << QStringLiteral("S") << QStringLiteral("d") << QStringLiteral("f") << QStringLiteral("t") << QStringLiteral("v");
     gotoTagForTypes(currWord, types);
 }
 
 /******************************************************************/
 void KateCTagsView::gotoDeclaration( )
 {
     QString currWord = currentWord();
     if (currWord.isEmpty()) {
         return;
     }
 
     QStringList types;
     types << QStringLiteral("L")
     << QStringLiteral("c")
     << QStringLiteral("e")
     << QStringLiteral("g")
     << QStringLiteral("m")
     << QStringLiteral("n")
     << QStringLiteral("p")
     << QStringLiteral("s")
     << QStringLiteral("u")
     << QStringLiteral("x");
     gotoTagForTypes(currWord, types);
 }
 
 /******************************************************************/
 void KateCTagsView::gotoTagForTypes(const QString &word, const QStringList &types)
 {
     Tags::TagList list = Tags::getMatches(m_ctagsUi.tagsFile->text(), word, false, types);
     if (list.size() == 0) list = Tags::getMatches(m_commonDB, word, false, types);
 
     //qCDebug(KTECTAGS) << "found" << list.count() << word << types;
     setNewLookupText(word);
 
     if ( list.count() < 1) {
         m_ctagsUi.tagTreeWidget->clear();
         new QTreeWidgetItem(m_ctagsUi.tagTreeWidget, QStringList(i18n("No hits found")));
         m_ctagsUi.tabWidget->setCurrentIndex(0);
         m_mWin->showToolView(m_toolView);
         return;
     }
 
     displayHits(list);
 
     if (list.count() == 1) {
         Tags::TagEntry tag = list.first();
         jumpToTag(tag.file, tag.pattern, word);
     }
     else {
         Tags::TagEntry tag = list.first();
         jumpToTag(tag.file, tag.pattern, word);
         m_ctagsUi.tabWidget->setCurrentIndex(0);
         m_mWin->showToolView(m_toolView);
     }
 }
 
 /******************************************************************/
 void KateCTagsView::setNewLookupText(const QString &newString)
 {
     m_ctagsUi.inputEdit->blockSignals( true );
     m_ctagsUi.inputEdit->setText(newString);
     m_ctagsUi.inputEdit->blockSignals( false );
 }
 
 /******************************************************************/
 void KateCTagsView::displayHits(const Tags::TagList &list)
 {
     m_ctagsUi.tagTreeWidget->clear();
     if (list.isEmpty()) {
         new QTreeWidgetItem(m_ctagsUi.tagTreeWidget, QStringList(i18n("No hits found")));
         return;
     }
     m_ctagsUi.tagTreeWidget->setSortingEnabled(false);
 
     for (int i=0; i<list.size(); i++) {
         QTreeWidgetItem* item = new QTreeWidgetItem(m_ctagsUi.tagTreeWidget);
         item->setText(0, list[i].tag);
         item->setText(1, list[i].type);
         item->setText(2, list[i].file);
         item->setData(0, Qt::UserRole, list[i].pattern);
 
         QString pattern = list[i].pattern;
         pattern.replace( QStringLiteral("\\/"), QStringLiteral("/"));
         pattern = pattern.mid(2, pattern.length() - 4);
         pattern = pattern.trimmed();
 
         item->setData(0, Qt::ToolTipRole, pattern);
         item->setData(1, Qt::ToolTipRole, pattern);
         item->setData(2, Qt::ToolTipRole, pattern);
     }
     m_ctagsUi.tagTreeWidget->setSortingEnabled(true);
 }
 
 /******************************************************************/
 void KateCTagsView::tagHitClicked(QTreeWidgetItem *item)
 {
     // get stuff
     const QString file = item->data(2, Qt::DisplayRole).toString();
     const QString pattern = item->data(0, Qt::UserRole).toString();
     const QString word = item->data(0, Qt::DisplayRole).toString();
 
     jumpToTag(file, pattern, word);
 }
 
 /******************************************************************/
 QString KateCTagsView::currentWord( )
 {
     KTextEditor::View *kv = m_mWin->activeView();
     if (!kv) {
         qCDebug(KTECTAGS) << "no KTextEditor::View" << endl;
         return QString();
     }
 
     if (kv->selection() && kv->selectionRange().onSingleLine()) {
         return kv->selectionText();
     }
 
     if (!kv->cursorPosition().isValid()) {
         qCDebug(KTECTAGS) << "cursor not valid!" << endl;
         return QString();
     }
 
     int line = kv->cursorPosition().line();
     int col = kv->cursorPosition().column();
     bool includeColon = m_ctagsUi.cmdEdit->text().contains(QLatin1String("--extra=+q"));
 
     QString linestr = kv->document()->line(line);
 
     int startPos = qMax(qMin(col, linestr.length()-1), 0);
     int endPos = startPos;
     while (startPos >= 0 && (linestr[startPos].isLetterOrNumber() ||
         (linestr[startPos] == QLatin1Char(':') && includeColon) ||
         linestr[startPos] == QLatin1Char('_') ||
         linestr[startPos] == QLatin1Char('~')))
     {
         startPos--;
     }
     while (endPos < (int)linestr.length() && (linestr[endPos].isLetterOrNumber() ||
         (linestr[endPos] == QLatin1Char(':') && includeColon) ||
         linestr[endPos] == QLatin1Char('_'))) {
         endPos++;
     }
     if  (startPos == endPos) {
         qCDebug(KTECTAGS) << "no word found!" << endl;
         return QString();
     }
 
     linestr = linestr.mid(startPos+1, endPos-startPos-1);
 
     while (linestr.endsWith(QLatin1Char(':'))) {
         linestr.remove(linestr.size()-1, 1);
     }
 
     while (linestr.startsWith(QLatin1Char(':'))) {
         linestr.remove(0, 1);
     }
 
     //qCDebug(KTECTAGS) << linestr;
     return linestr;
 }
 
 /******************************************************************/
 void KateCTagsView::jumpToTag(const QString &file, const QString &pattern, const QString &word)
 {
     if (pattern.isEmpty()) return;
 
     // generate a regexp from the pattern
     // ctags interestingly escapes "/", but apparently nothing else. lets revert that
     QString unescaped = pattern;
     unescaped.replace( QStringLiteral("\\/"), QStringLiteral("/") );
 
     // most of the time, the ctags pattern has the form /^foo$/
     // but this isn't true for some macro definitions
     // where the form is only /^foo/
     // I have no idea if this is a ctags bug or not, but we have to deal with it
 
     QString reduced;
     QString escaped;
     QString re_string;
 
     if (unescaped.endsWith(QStringLiteral("$/"))) {
         reduced = unescaped.mid(2, unescaped.length() - 4);
         escaped = QRegExp::escape(reduced);
         re_string = QStringLiteral("^%1$").arg(escaped);
     }
     else {
         reduced = unescaped.mid( 2, unescaped.length() -3 );
         escaped = QRegExp::escape(reduced);
         re_string = QStringLiteral("^%1").arg(escaped);
     }
 
     QRegExp re(re_string);
 
     // save current location
     TagJump from;
     from.url    = m_mWin->activeView()->document()->url();
     from.cursor = m_mWin->activeView()->cursorPosition();
     m_jumpStack.push(from);
 
     // open/activate the new file
     QFileInfo fInfo(file);
     //qCDebug(KTECTAGS) << pattern << file << fInfo.absoluteFilePath();
     m_mWin->openUrl(QUrl::fromLocalFile(fInfo.absoluteFilePath()));
 
     // any view active?
     if (!m_mWin->activeView()) {
         return;
     }
 
     // look for the line
     QString linestr;
     int line;
     for (line =0; line < m_mWin->activeView()->document()->lines(); line++) {
         linestr = m_mWin->activeView()->document()->line(line);
         if (linestr.indexOf(re) > -1) break;
     }
 
     // activate the line
     if (line != m_mWin->activeView()->document()->lines()) {
         // line found now look for the column
         int column = linestr.indexOf(word) + (word.length()/2);
         m_mWin->activeView()->setCursorPosition(KTextEditor::Cursor(line, column));
     }
     m_mWin->activeView()->setFocus();
 
 }
 
 
 /******************************************************************/
 void KateCTagsView::startEditTmr()
 {
     if (m_ctagsUi.inputEdit->text().size() > 3) {
         m_editTimer.start(500);
     }
 }
 
 
 /******************************************************************/
 void KateCTagsView::updateSessionDB()
 {
     if (m_proc.state() != QProcess::NotRunning) {
         return;
     }
 
     QString targets;
     QString target;
     for (int i=0; i<m_ctagsUi.targetList->count(); i++) {
       target = m_ctagsUi.targetList->item(i)->text();
       if (target.endsWith(QLatin1Char('/')) || target.endsWith(QLatin1Char('\\'))) {
         target = target.left(target.size() - 1);
       }
       targets += target + QLatin1Char(' ');
     }
 
     QString pluginFolder = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/katectags");
     QDir().mkpath(pluginFolder);
 
     if (m_ctagsUi.tagsFile->text().isEmpty()) {
         // FIXME we need a way to get the session name
         pluginFolder += QLatin1String("/session_db_");
         pluginFolder += QDateTime::currentDateTimeUtc().toString(QStringLiteral("yyyyMMdd_hhmmss"));
         m_ctagsUi.tagsFile->setText(pluginFolder);
     }
 
     if (targets.isEmpty()) {
         KMessageBox::error(nullptr, i18n("No folders or files to index"));
         QFile::remove(m_ctagsUi.tagsFile->text());
         return;
     }
 
 
     QString command = QStringLiteral("%1 -f %2 %3").arg(m_ctagsUi.cmdEdit->text()).arg(m_ctagsUi.tagsFile->text()).arg(targets);
 
     m_proc.start(command);
 
     if(!m_proc.waitForStarted(500)) {
         KMessageBox::error(nullptr, i18n("Failed to run \"%1\". exitStatus = %2", command, m_proc.exitStatus()));
         return;
     }
     QApplication::setOverrideCursor(QCursor(Qt::BusyCursor));
     m_ctagsUi.updateButton->setDisabled(true);
     m_ctagsUi.updateButton2->setDisabled(true);
 }
 
 
 /******************************************************************/
 void KateCTagsView::updateDone(int exitCode, QProcess::ExitStatus status)
 {
     if (status == QProcess::CrashExit) {
         KMessageBox::error(m_toolView, i18n("The CTags executable crashed."));
     } else if (exitCode != 0) {
         KMessageBox::error(m_toolView, i18n("The CTags program exited with code %1: %2"
         , exitCode
         , QString::fromLocal8Bit(m_proc.readAllStandardError())));
     }
 
     m_ctagsUi.updateButton->setDisabled(false);
     m_ctagsUi.updateButton2->setDisabled(false);
     QApplication::restoreOverrideCursor();
 }
 
 /******************************************************************/
 void KateCTagsView::addTagTarget()
 {
     QFileDialog dialog;
     dialog.setDirectory(QFileInfo(m_mWin->activeView()->document()->url().path()).path());
     dialog.setFileMode(QFileDialog::Directory);
 
     // i18n("CTags Database Location"));
     if (dialog.exec() != QDialog::Accepted) {
         return;
     }
 
     QStringList urls = dialog.selectedFiles();
 
     for (int i=0; i<urls.size(); i++) {
         if (!listContains(urls[i])) {
             new QListWidgetItem(urls[i], m_ctagsUi.targetList);
         }
     }
 }
 
 /******************************************************************/
 void KateCTagsView::delTagTarget()
 {
     delete m_ctagsUi.targetList->currentItem ();
 }
 
 /******************************************************************/
 bool KateCTagsView::listContains(const QString &target)
 {
     for (int i=0; i<m_ctagsUi.targetList->count(); i++) {
         if (m_ctagsUi.targetList->item(i)->text() == target) {
             return true;
         }
     }
     return false;
 }
 
 /******************************************************************/
 bool KateCTagsView::eventFilter(QObject *obj, QEvent *event)
 {
     if (event->type() == QEvent::KeyPress) {
         QKeyEvent *ke = static_cast<QKeyEvent*>(event);
         if ((obj == m_toolView) && (ke->key() == Qt::Key_Escape)) {
             m_mWin->hideToolView(m_toolView);
             event->accept();
             return true;
         }
     }
     return QObject::eventFilter(obj, event);
 }
 
 /******************************************************************/
 void KateCTagsView::resetCMD()
 {
     m_ctagsUi.cmdEdit->setText(DEFAULT_CTAGS_CMD);
 }
 
 /******************************************************************/
 void KateCTagsView::handleEsc(QEvent *e)
 {
     if (!m_mWin) return;
 
     QKeyEvent *k = static_cast<QKeyEvent *>(e);
     if (k->key() == Qt::Key_Escape && k->modifiers() == Qt::NoModifier) {
         if (m_toolView->isVisible()) {
             m_mWin->hideToolView(m_toolView);
         }
     }
 }
 
diff --git a/addons/kate-ctags/kate_ctags_view.h b/addons/kate-ctags/kate_ctags_view.h
index 75e563f4d..752cef220 100644
--- a/addons/kate-ctags/kate_ctags_view.h
+++ b/addons/kate-ctags/kate_ctags_view.h
@@ -1,119 +1,119 @@
 #ifndef KATE_CTAGS_VIEW_H
 #define KATE_CTAGS_VIEW_H
 /* Description : Kate CTags plugin
  * 
  * Copyright (C) 2008-2011 by Kare Sars <kare.sars@iki.fi>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) version 3, or any
  * later version accepted by the membership of KDE e.V. (or its
  * successor approved by the membership of KDE e.V.), which shall
  * act as a proxy defined in Section 6 of version 3 of the license.
  *
  * This program 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
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
 #include <KTextEditor/View>
 #include <KTextEditor/Document>
 
 #include <KTextEditor/Application>
 #include <KTextEditor/MainWindow>
 #include <ktexteditor/sessionconfiginterface.h>
 
 #include <QProcess>
 #include <KXMLGUIClient>
 
 #include <QStack>
 #include <QTimer>
 #include <KActionMenu>
 #include <QPointer>
 
 #include "tags.h"
 
 #include "ui_kate_ctags.h"
 
 const static QString DEFAULT_CTAGS_CMD = QLatin1String("ctags -R --c++-types=+px --extra=+q --excmd=pattern --exclude=Makefile --exclude=.");
 
 typedef struct
 {
     QUrl url;
     KTextEditor::Cursor cursor;
 } TagJump;
 
 /******************************************************************/
 class KateCTagsView : public QObject, public KXMLGUIClient, public KTextEditor::SessionConfigInterface
 {
     Q_OBJECT
     Q_INTERFACES(KTextEditor::SessionConfigInterface)
 
 public:
   KateCTagsView(KTextEditor::Plugin *plugin, KTextEditor::MainWindow *mainWin);
     ~KateCTagsView() override;
 
     // reimplemented: read and write session config
     void readSessionConfig (const KConfigGroup& config) override;
     void writeSessionConfig (KConfigGroup& config) override;
 
 public Q_SLOTS:
     void gotoDefinition();
     void gotoDeclaration();
     void lookupTag();
     void stepBack();
     void editLookUp();
     void aboutToShow();
     void tagHitClicked(QTreeWidgetItem *);
     void startEditTmr();
     
     void addTagTarget();
     void delTagTarget();
     
     void updateSessionDB();
     void updateDone(int exitCode, QProcess::ExitStatus status);
 
 protected:
     bool eventFilter(QObject *obj, QEvent *ev) override;
 
 private Q_SLOTS:
     void resetCMD();
     void handleEsc(QEvent *e);
 
 private:
     bool listContains(const QString &target);
 
     QString currentWord();
     
     void setNewLookupText(const QString &newText);
     void displayHits(const Tags::TagList &list);
     
     void gotoTagForTypes(const QString &tag, QStringList const &types);
     void jumpToTag(const QString &file, const QString &pattern, const QString &word);
     
 
-    KTextEditor::MainWindow *m_mWin;
+    QPointer<KTextEditor::MainWindow> m_mWin;
     QWidget               *m_toolView;
     Ui::kateCtags          m_ctagsUi;
 
     QPointer<KActionMenu>  m_menu;
     QAction               *m_gotoDef;
     QAction               *m_gotoDec;
     QAction               *m_lookup;
 
     QProcess               m_proc;
     QString                m_commonDB;
 
     QTimer                 m_editTimer;
     QStack<TagJump>        m_jumpStack;
 };
 
 
 #endif
 
diff --git a/addons/kate-ctags/katectagsplugin.desktop b/addons/kate-ctags/katectagsplugin.desktop
index ef3965654..660b14bb5 100644
--- a/addons/kate-ctags/katectagsplugin.desktop
+++ b/addons/kate-ctags/katectagsplugin.desktop
@@ -1,118 +1,118 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=KTextEditor/Plugin
+ServiceTypes=KTextEditor/Plugin,KDevelop/Plugin
 X-KDE-Library=katectagsplugin
 Name=CTags
 Name[ar]=وسوم سي
 Name[ast]=CTags
 Name[bg]=CTags
 Name[bs]=C‑tags
 Name[ca]=CTags
 Name[ca@valencia]=CTags
 Name[cs]=CTags
 Name[da]=CTags
 Name[de]=CTags
 Name[el]=CTags
 Name[en_GB]=CTags
 Name[es]=CTags
 Name[et]=CTags
 Name[eu]=CTags
 Name[fa]=CTags
 Name[fi]=CTags
 Name[fr]=CTags
 Name[ga]=CTags
 Name[gl]=CTags
 Name[he]=CTags
 Name[hu]=CTags
 Name[ia]=CTags
 Name[id]=CTags
 Name[is]=CTags
 Name[it]=CTags
 Name[kk]=CTags
 Name[km]=CTags
 Name[ko]=CTags
 Name[lt]=CTags
 Name[lv]=CTags
 Name[mr]=CTags
 Name[nb]=CTags
 Name[nds]=CTags
 Name[nl]=CTags
 Name[nn]=CTags
 Name[pa]=CTags
 Name[pl]=CTags
 Name[pt]=CTags
 Name[pt_BR]=CTags
 Name[ro]=CTags
 Name[ru]=CTags
 Name[si]=CTags
 Name[sk]=CTags
 Name[sl]=CTags
 Name[sr]=Ц‑тагс
 Name[sr@ijekavian]=Ц‑тагс
 Name[sr@ijekavianlatin]=CTags
 Name[sr@latin]=CTags
 Name[sv]=CTags
 Name[tg]=CTags
 Name[tr]=CTags
 Name[ug]=CTags
 Name[uk]=CTags
 Name[wa]=CTags
 Name[x-test]=xxCTagsxx
 Name[zh_CN]=CTags
 Name[zh_TW]=CTags
 Comment=Look up definitions/declarations with CTags
 Comment[ar]=تبحث عن التّعريفات والإعلانات ب‍CTags
 Comment[ast]=Gueta definiciones/declaraciones con CTags
 Comment[bg]=Проверка на дефиниции и декларации с CTag
 Comment[bs]=Tražite definicije i deklaracije C‑tagsom
 Comment[ca]=Cerca definicions/declaracions amb CTags
 Comment[ca@valencia]=Cerca definicions/declaracions amb CTags
 Comment[cs]=Vyhledávání definic/deklarací pomocí CTags
 Comment[da]=Slå definitioner/erklæringer op med CTags
 Comment[de]=Definition/Deklaration mit CTags nachschauen
 Comment[el]=Αναζήτηση ορισμών/δηλώσεων με το CTags
 Comment[en_GB]=Look up definitions/declarations with CTags
 Comment[es]=Buscar definiciones/declaraciones con CTags
 Comment[et]=Definitsiooni/deklaratsiooni otsimine CTagsiga
 Comment[eu]=Bilatu CTags duten definizioak/deklarazioak
 Comment[fi]=Hyppää määrittelyihin/esittelyihin käyttäen CTagsia
 Comment[fr]=Cherche des définitions / déclarations avec CTags
 Comment[ga]=Cuardaigh sainmhínithe/fógraí le CTags
 Comment[gl]=Busca de definicións/declaracións con CTags
 Comment[he]=חפש הגדרות של משתנים בעזרת CTags
 Comment[hu]=Definíciók/deklarációk kikeresése CTags segítségével
 Comment[ia]=Cerca definitiones/declarationes con CTags
 Comment[id]=Mencari definisi/deklarasi dengan CTags
 Comment[it]=Cerca definizioni e dichiarazioni con CTags
 Comment[ja]=CTags を使って定義/宣言を検索します
 Comment[kk]=CTags көмегімен анықтамалар/жарияламаларды қарастыру
 Comment[km]=រក​មើល​និយមន័យ/កា​រ​ប្រកាស​ជា​មួយ CTags
 Comment[ko]=CTags를 사용하여 선언/정의 찾기
 Comment[lt]=Peržiūrėti apibrėžimus naudojant CTags
 Comment[lv]=Uzmeklē definīcijas/deklarācijas ar CTags
 Comment[mr]=CTags ने व्याख्या/डिक्लेरेशन्स बघतो
 Comment[nb]=Slå opp definisjoner og deklarasjoner med CTags
 Comment[nds]=Definitschonen/Deklaratschonen mit CTags nakieken
 Comment[nl]=Defenities/declaraties opzoeken met CTags
 Comment[nn]=Slå opp definisjonar og deklarasjonar med CTags
 Comment[pl]=Wyszukiwanie definicji/deklaracji w CTags
 Comment[pt]=Procurar por definições/declarações com o CTags
 Comment[pt_BR]=Procura definições/declarações com o CTags
 Comment[ro]=Caută definiții/declarații cu CTags
 Comment[ru]=Поиск определений и объявлений с помощью индекса CTags
 Comment[si]=CTag සමඟ යෙදුම්/හැඳින්වීම බලන්න
 Comment[sk]=Vyhľadať definície/deklarácie s CTags
 Comment[sl]=Poiščite definicije in deklaracije
 Comment[sr]=Тражите дефиниције и декларације Ц‑тагсом
 Comment[sr@ijekavian]=Тражите дефиниције и декларације Ц‑тагсом
 Comment[sr@ijekavianlatin]=Tražite definicije i deklaracije CTagsom
 Comment[sr@latin]=Tražite definicije i deklaracije CTagsom
 Comment[sv]=Slå upp definitioner och deklarationer med Ctags
 Comment[tg]=Намоиши маъно/эъломияҳо тавассути CTags
 Comment[tr]=CTags ile bildirimlerde ve tanımlamalarda ara
 Comment[ug]=CTags ئىشلىتىپ كودتىكى ئېنىقلىما/بايانات ئىزدەيدۇ
 Comment[uk]=Пошук визначень і оголошень за допомогою CTags
 Comment[x-test]=xxLook up definitions/declarations with CTagsxx
 Comment[zh_CN]=使用 CTags 查阅代码中的定义/声明
 Comment[zh_TW]=使用 CTags 尋找定義與宣告
 
diff --git a/addons/kate-ctags/ui.rc b/addons/kate-ctags/ui.rc
index 6f73ae507..41ee008cc 100644
--- a/addons/kate-ctags/ui.rc
+++ b/addons/kate-ctags/ui.rc
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE kpartgui>
-<gui name="katectags-plugin" library="katectagsplugin" version="3" translationDomain="kate-ctags-plugin">
+<gui name="katectags-plugin" library="katectagsplugin" version="4" translationDomain="kate-ctags-plugin">
   <MenuBar>
     <Menu name="CTags Menubar">
       <text>CTags</text>
       <Action name="ctags_return_step"/>
       <Action name="ctags_lookup_current"/>
       <Action name="ctags_lookup_current_as_declaration"/>
       <Action name="ctags_lookup_current_as_definition"/>
       <Action name="ctags_jump_to_next_matcht"/>
+      <Separator/>
+      <Action name="ctags_update_global_db"/>
     </Menu>
   </MenuBar>
   <Menu name="ktexteditor_popup" noMerge="1">
     <Action name="popup_ctags"/>
   </Menu>
 </gui>
 <!-- kate: space-indent on; indent-width 4; replace-tabs on; -->