diff --git a/documentation/qthelp/qthelpconfig.cpp b/documentation/qthelp/qthelpconfig.cpp
index 7e29776e00..d31ce93b9b 100644
--- a/documentation/qthelp/qthelpconfig.cpp
+++ b/documentation/qthelp/qthelpconfig.cpp
@@ -1,359 +1,351 @@
 /*  This file is part of KDevelop
 
     Copyright 2010 Benjamin Port <port.benjamin@gmail.com>
     Copyright 2014 Kevin Funk <kfunk@kde.org>
     Copyright 2016 Andreas Cord-Landwehr <cordlandwehr@kde.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 "qthelpconfig.h"
 
 #include <QHelpEngineCore>
 #include <QFileDialog>
 #include <QToolButton>
 #include <QHeaderView>
 
 #include <KMessageBox>
 #include <KMessageWidget>
 #include <KLocalizedString>
 #include <KNS3/Button>
 
 #include "ui_qthelpconfig.h"
 #include "ui_qthelpconfigeditdialog.h"
 #include "qthelp_config_shared.h"
 #include "debug.h"
 #include "qthelpplugin.h"
 
 enum Column
 {
     NameColumn,
     PathColumn,
     IconColumn,
     GhnsColumn,
     ConfigColumn
 };
 
 class QtHelpConfigEditDialog : public QDialog, public Ui_QtHelpConfigEditDialog
 {
 public:
     explicit QtHelpConfigEditDialog(QTreeWidgetItem* modifiedItem, QtHelpConfig* parent = 0,
                                     Qt::WindowFlags f = 0)
         : QDialog(parent, f)
         , m_modifiedItem(modifiedItem)
         , m_config(parent)
     {
         setupUi(this);
 
         if (modifiedItem) {
             setWindowTitle(i18n("Modify Entry"));
         } else {
             setWindowTitle(i18n("Add New Entry"));
         }
         qchIcon->setIcon("qtlogo");
     }
 
     bool checkQtHelpFile();
 
     void accept() override;
 
 private:
     QTreeWidgetItem* m_modifiedItem;
     QtHelpConfig* m_config;
 };
 
 bool QtHelpConfigEditDialog::checkQtHelpFile()
 {
     //verify if the file is valid and if there is a name
     if(qchName->text().isEmpty()){
         KMessageBox::error(this, i18n("Name cannot be empty."));
         return false;
     }
 
     return m_config->checkNamespace(qchRequester->text(), m_modifiedItem);
 }
 
 void QtHelpConfigEditDialog::accept()
 {
     if (!checkQtHelpFile())
         return;
 
     QDialog::accept();
 }
 
 QtHelpConfig::QtHelpConfig(QtHelpPlugin* plugin, QWidget *parent)
     : KDevelop::ConfigPage(plugin, nullptr, parent)
 {
     QVBoxLayout * l = new QVBoxLayout( this );
 
     QWidget* w = new QWidget;
     m_configWidget = new Ui::QtHelpConfigUI;
     m_configWidget->setupUi( w );
     m_configWidget->addButton->setIcon(QIcon::fromTheme("list-add"));
     connect(m_configWidget->addButton, &QPushButton::clicked, this, &QtHelpConfig::add);
 
     // Table
     m_configWidget->qchTable->setColumnHidden(IconColumn, true);
     m_configWidget->qchTable->setColumnHidden(GhnsColumn, true);
     m_configWidget->qchTable->model()->setHeaderData(ConfigColumn, Qt::Horizontal, QVariant());
     m_configWidget->qchTable->header()->setSectionsMovable(false);
     m_configWidget->qchTable->header()->setStretchLastSection(false);
     m_configWidget->qchTable->header()->setSectionResizeMode(NameColumn, QHeaderView::Stretch);
     m_configWidget->qchTable->header()->setSectionResizeMode(PathColumn, QHeaderView::Stretch);
     m_configWidget->qchTable->header()->setSectionResizeMode(ConfigColumn, QHeaderView::Fixed);
 
     // Add GHNS button
     KNS3::Button *knsButton = new KNS3::Button(i18nc("Allow user to get some API documentation with GHNS", "Get New Documentation"), "kdevelop-qthelp.knsrc", m_configWidget->boxQchManage);
     m_configWidget->tableCtrlLayout->insertWidget(1, knsButton);
     connect(knsButton, &KNS3::Button::dialogFinished, this, &QtHelpConfig::knsUpdate);
-    connect(m_configWidget->loadQtDocsCheckBox, &QCheckBox::toggled, this, static_cast<void(QtHelpConfig::*)()>(&QtHelpConfig::changed));
-    connect(m_configWidget->qchSearchDirButton, &QPushButton::clicked, this, &QtHelpConfig::chooseSearchDir);
-    connect(m_configWidget->qchSearchDir,&QLineEdit::textChanged, this, &QtHelpConfig::searchDirChanged);
+    connect(m_configWidget->loadQtDocsCheckBox, &QCheckBox::toggled,
+            this, static_cast<void(QtHelpConfig::*)()>(&QtHelpConfig::changed));
+    m_configWidget->qchSearchDir->setMode(KFile::Directory);
+    connect(m_configWidget->qchSearchDir, &KUrlRequester::textChanged,
+            this, &QtHelpConfig::changed);
 
     // Set availability information for QtHelp
     m_configWidget->messageAvailabilityQtDocs->setCloseButtonVisible(false);
     if(plugin->isQtHelpAvailable()) {
         m_configWidget->messageAvailabilityQtDocs->setVisible(false);
     } else {
         m_configWidget->messageAvailabilityQtDocs->setText(
             i18n("The command \"qmake -query\" could not provide a path to a QtHelp file (QCH)."));
         m_configWidget->loadQtDocsCheckBox->setVisible(false);
     }
     l->addWidget(w);
     reset();
 }
 
 QtHelpConfig::~QtHelpConfig()
 {
     delete m_configWidget;
 }
 
 void QtHelpConfig::apply()
 {
     QStringList iconList, nameList, pathList, ghnsList;
     for (int i = 0; i < m_configWidget->qchTable->topLevelItemCount(); i++) {
         const QTreeWidgetItem* item = m_configWidget->qchTable->topLevelItem(i);
         nameList << item->text(0);
         pathList << item->text(1);
         iconList << item->text(2);
         ghnsList << item->text(3);
     }
     QString searchDir = m_configWidget->qchSearchDir->text();
     bool loadQtDoc = m_configWidget->loadQtDocsCheckBox->isChecked();
 
     qtHelpWriteConfig(iconList, nameList, pathList, ghnsList, searchDir, loadQtDoc);
     static_cast<QtHelpPlugin*>(plugin())->readConfig();
 }
 
 void QtHelpConfig::reset()
 {
     m_configWidget->qchTable->clear();
 
     QStringList iconList, nameList, pathList, ghnsList;
     QString searchDir;
     bool loadQtDoc;
     qtHelpReadConfig(iconList, nameList, pathList, ghnsList, searchDir, loadQtDoc);
 
     const int size = qMin(qMin(iconList.size(), nameList.size()), pathList.size());
     for(int i = 0; i < size; ++i) {
         QString ghnsStatus = ghnsList.size()>i ? ghnsList.at(i) : "0";
         addTableItem(iconList.at(i), nameList.at(i), pathList.at(i), ghnsStatus);
     }
     m_configWidget->qchSearchDir->setText(searchDir);
     m_configWidget->loadQtDocsCheckBox->setChecked(loadQtDoc);
 
     emit changed();
 }
 
 void QtHelpConfig::defaults()
 {
     bool change = false;
     if(m_configWidget->qchTable->topLevelItemCount() > 0) {
         m_configWidget->qchTable->clear();
         change = true;
     }
     if(!m_configWidget->loadQtDocsCheckBox->isChecked()){
         m_configWidget->loadQtDocsCheckBox->setChecked(true);
         change = true;
     }
 
     if (change) {
         emit changed();
     }
 }
 
 void QtHelpConfig::add()
 {
     QtHelpConfigEditDialog dialog(0, this);
     if (!dialog.exec())
         return;
 
     QTreeWidgetItem* item = addTableItem(dialog.qchIcon->icon(), dialog.qchName->text(), dialog.qchRequester->text(), "0");
     m_configWidget->qchTable->setCurrentItem(item);
     emit changed();
 }
 
 void QtHelpConfig::modify(QTreeWidgetItem* item)
 {
     if (!item)
         return;
 
     QtHelpConfigEditDialog dialog(item, this);
     if (item->text(GhnsColumn) != "0") {
         dialog.qchRequester->setText(i18n("Documentation provided by GHNS"));
         dialog.qchRequester->setEnabled(false);
     } else {
         dialog.qchRequester->setText(item->text(PathColumn));
         dialog.qchRequester->setEnabled(true);
     }
     dialog.qchName->setText(item->text(NameColumn));
     dialog.qchIcon->setIcon(item->text(IconColumn));
     if (!dialog.exec()) {
         return;
     }
 
     item->setIcon(NameColumn, QIcon(dialog.qchIcon->icon()));
     item->setText(NameColumn, dialog.qchName->text());
     item->setText(IconColumn, dialog.qchIcon->icon());
     if(item->text(GhnsColumn) == "0") {
         item->setText(PathColumn, dialog.qchRequester->text());
     }
     emit changed();
 }
 
 bool QtHelpConfig::checkNamespace(const QString& filename, QTreeWidgetItem* modifiedItem)
 {
     QString qtHelpNamespace = QHelpEngineCore::namespaceName(filename);
     if (qtHelpNamespace.isEmpty()) {
         // Open error message (not valid Qt Compressed Help file)
         KMessageBox::error(this, i18n("Qt Compressed Help file is not valid."));
         return false;
     }
     // verify if it's the namespace it's not already in the list
     for(int i=0; i < m_configWidget->qchTable->topLevelItemCount(); i++) {
         const QTreeWidgetItem* item = m_configWidget->qchTable->topLevelItem(i);
         if (item != modifiedItem){
             if (qtHelpNamespace == QHelpEngineCore::namespaceName(item->text(PathColumn))) {
                 // Open error message, documentation already imported
                 KMessageBox::error(this, i18n("Documentation already imported"));
                 return false;
             }
         }
     }
     return true;
 }
 
 void QtHelpConfig::remove(QTreeWidgetItem* item)
 {
     if (!item)
         return;
 
     delete item;
     emit changed();
 }
 
 void QtHelpConfig::knsUpdate(KNS3::Entry::List list)
 {
     if (list.isEmpty())
         return;
 
     foreach (const KNS3::Entry& e, list) {
         if(e.status() == KNS3::Entry::Installed) {
             if(e.installedFiles().size() == 1) {
                 QString filename = e.installedFiles().at(0);
                 if(checkNamespace(filename, nullptr)){
                     QTreeWidgetItem* item = addTableItem("documentation", e.name(), filename, "1");
                     m_configWidget->qchTable->setCurrentItem(item);
                 } else {
                     qCDebug(QTHELP) << "namespace error";
                 }
             }
         } else if(e.status() ==  KNS3::Entry::Deleted) {
             if(e.uninstalledFiles().size() == 1) {
                 for(int i=0; i < m_configWidget->qchTable->topLevelItemCount(); i++) {
                     QTreeWidgetItem* item = m_configWidget->qchTable->topLevelItem(i);
                     if (e.uninstalledFiles().at(0) == item->text(PathColumn)) {
                         delete item;
                         break;
                     }
                 }
             }
         }
     }
     emit changed();
 }
 
-void QtHelpConfig::chooseSearchDir()
-{
-    m_configWidget->qchSearchDir->setText(QFileDialog::getExistingDirectory(this));
-}
-
-void QtHelpConfig::searchDirChanged()
-{
-    emit changed();
-}
-
 QString QtHelpConfig::name() const
 {
     return i18n("QtHelp Documentation");
 }
 
 QIcon QtHelpConfig::icon() const
 {
     return QIcon::fromTheme(QStringLiteral("help-contents"));
 }
 
 QTreeWidgetItem * QtHelpConfig::addTableItem(const QString &icon, const QString &name,
                                              const QString &path, const QString &ghnsStatus)
 {
     QTreeWidgetItem *item = new QTreeWidgetItem(m_configWidget->qchTable);
     item->setIcon(NameColumn, QIcon::fromTheme(icon));
     item->setText(NameColumn, name);
     item->setToolTip(NameColumn, name);
     item->setText(PathColumn, path);
     item->setToolTip(PathColumn, path);
     item->setText(IconColumn, icon);
     item->setText(GhnsColumn, ghnsStatus);
 
     QWidget *ctrlWidget = new QWidget(item->treeWidget());
     ctrlWidget->setLayout(new QHBoxLayout(ctrlWidget));
 
     QToolButton *modifyBtn = new QToolButton(item->treeWidget());
     modifyBtn->setIcon(QIcon::fromTheme("document-edit"));
     modifyBtn->setToolTip(ki18n("Modify").toString());
     connect(modifyBtn, &QPushButton::clicked, this, [=](){
         modify(item);
     });
     QToolButton *removeBtn = new QToolButton(item->treeWidget());
     removeBtn->setIcon(QIcon::fromTheme("entry-delete"));
     removeBtn->setToolTip(ki18n("Delete").toString());
     if (item->text(GhnsColumn) != "0") {
         // KNS3 currently does not provide API to uninstall entries
         // just removing the files results in wrong installed states in the KNS3 dialog
         // TODO: add API to KNS to remove files without UI interaction
         removeBtn->setEnabled(false);
         removeBtn->setToolTip(tr("Please uninstall this via GHNS"));
     } else {
         connect(removeBtn, &QPushButton::clicked, this, [=](){
             remove(item);
         });
     }
     ctrlWidget->layout()->addWidget(modifyBtn);
     ctrlWidget->layout()->addWidget(removeBtn);
     m_configWidget->qchTable->setItemWidget(item, ConfigColumn, ctrlWidget);
 
     return item;
 }
diff --git a/documentation/qthelp/qthelpconfig.h b/documentation/qthelp/qthelpconfig.h
index 3720699802..642da4a1b4 100644
--- a/documentation/qthelp/qthelpconfig.h
+++ b/documentation/qthelp/qthelpconfig.h
@@ -1,69 +1,67 @@
 /*  This file is part of KDevelop
 
     Copyright 2010 Benjamin Port <port.benjamin@gmail.com>
     Copyright 2014 Kevin Funk <kfunk@kde.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.
 */
 
 #ifndef QTHELPCONFIG_H
 #define QTHELPCONFIG_H
 
 #include <kdevplatform/interfaces/configpage.h>
 
 #include <KNS3/Entry>
 
 class QTreeWidgetItem;
 class QtHelpPlugin;
 
 namespace Ui
 {
     class QtHelpConfigUI;
 }
 
 class QtHelpConfig : public KDevelop::ConfigPage
 {
 public:
     Q_OBJECT
 
     public:
       explicit QtHelpConfig(QtHelpPlugin* plugin, QWidget *parent = 0);
       ~QtHelpConfig() override;
 
       bool checkNamespace(const QString &filename, QTreeWidgetItem* modifiedItem);
 
       QString name() const override;
       QIcon icon() const override;
 
     private slots:
       void add();
       void remove(QTreeWidgetItem* item);
       void modify(QTreeWidgetItem* item);
       void knsUpdate(KNS3::Entry::List list);
-      void chooseSearchDir();
-      void searchDirChanged();
 
     public Q_SLOTS:
       void apply() override;
       void defaults() override;
       void reset() override;
     private:
       QTreeWidgetItem * addTableItem(const QString &icon, const QString &name,
                                      const QString &path, const QString &ghnsStatus);
       Ui::QtHelpConfigUI* m_configWidget;
 };
 
 #endif // QTHELPCONFIG_H
diff --git a/documentation/qthelp/qthelpconfig.ui b/documentation/qthelp/qthelpconfig.ui
index 6e882b194b..8886c97859 100644
--- a/documentation/qthelp/qthelpconfig.ui
+++ b/documentation/qthelp/qthelpconfig.ui
@@ -1,251 +1,200 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QtHelpConfigUI</class>
  <widget class="QWidget" name="QtHelpConfigUI">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>560</width>
     <height>443</height>
    </rect>
   </property>
   <property name="locale">
    <locale language="English" country="UnitedStates"/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QGroupBox" name="boxAutoLoad">
      <property name="title">
       <string>Load QtHelp Documentation from System Locations</string>
      </property>
-     <layout class="QFormLayout" name="formLayout_3">
+     <layout class="QFormLayout" name="formLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="labelLoadQtApiDocs">
         <property name="text">
-         <string>Load Qt API documentation:</string>
+         <string>&amp;Load Qt API documentation:</string>
         </property>
         <property name="buddy">
          <cstring>loadQtDocsCheckBox</cstring>
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
+      <item row="0" column="1">
+       <widget class="QCheckBox" name="loadQtDocsCheckBox">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
        <widget class="QLabel" name="labelLoadFromDirectory">
         <property name="text">
          <string>Load QtHelp files from directory:</string>
         </property>
-        <property name="buddy">
-         <cstring>qchSearchDir</cstring>
-        </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QWidget" name="widgetLoadQtApiDocs" native="true">
-        <layout class="QVBoxLayout" name="verticalLayout_6">
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_6">
-           <property name="spacing">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="KMessageWidget" name="messageAvailabilityQtDocs" native="true">
-             <property name="enabled">
-              <bool>true</bool>
-             </property>
-             <property name="minimumSize">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="text" stdset="0">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QCheckBox" name="loadQtDocsCheckBox">
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </widget>
+      <item row="1" column="1">
+       <widget class="KUrlRequester" name="qchSearchDir" native="true"/>
       </item>
-      <item row="2" column="1">
-       <widget class="QWidget" name="widgetLoadDirectory" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
+      <item row="2" column="0" colspan="2">
+       <widget class="KMessageWidget" name="messageAvailabilityQtDocs" native="true">
+        <property name="enabled">
+         <bool>true</bool>
         </property>
         <property name="minimumSize">
          <size>
           <width>0</width>
           <height>0</height>
          </size>
         </property>
-        <layout class="QHBoxLayout" name="horizontalLayout_5">
-         <item>
-          <widget class="QLineEdit" name="qchSearchDir">
-           <property name="text">
-            <string/>
-           </property>
-           <property name="placeholderText">
-            <string>Search QtHelp files in this directory...</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_4">
-           <item>
-            <widget class="QPushButton" name="qchSearchDirButton">
-             <property name="text">
-              <string/>
-             </property>
-             <property name="icon">
-              <iconset theme="document-open-folder">
-               <normaloff/>
-              </iconset>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
+        <property name="text" stdset="0">
+         <string/>
+        </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="boxQchManage">
      <property name="title">
       <string>Install Additional Documentation Files</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
          <layout class="QVBoxLayout" name="verticalLayout_5">
           <property name="spacing">
            <number>1</number>
           </property>
           <property name="leftMargin">
            <number>0</number>
           </property>
           <item>
            <widget class="QTreeWidget" name="qchTable">
             <property name="editTriggers">
              <set>QAbstractItemView::NoEditTriggers</set>
             </property>
             <property name="rootIsDecorated">
              <bool>false</bool>
             </property>
             <property name="wordWrap">
              <bool>false</bool>
             </property>
             <property name="columnCount">
              <number>5</number>
             </property>
             <property name="showGrid" stdset="0">
              <bool>false</bool>
             </property>
             <attribute name="headerVisible">
              <bool>true</bool>
             </attribute>
             <column>
              <property name="text">
               <string>Name</string>
              </property>
             </column>
             <column>
              <property name="text">
               <string>Path</string>
              </property>
             </column>
             <column>
              <property name="text">
               <string notr="true">IconName</string>
              </property>
             </column>
             <column>
              <property name="text">
               <string notr="true">Ghns</string>
              </property>
             </column>
             <column>
              <property name="text">
               <string notr="true"/>
              </property>
             </column>
            </widget>
           </item>
           <item>
            <layout class="QHBoxLayout" name="tableCtrlLayout">
             <item>
              <widget class="QPushButton" name="addButton">
               <property name="text">
                <string>Add</string>
               </property>
              </widget>
             </item>
             <item>
              <spacer name="horizontalSpacer">
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
                 <width>40</width>
                 <height>20</height>
                </size>
               </property>
              </spacer>
             </item>
            </layout>
           </item>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_3">
             <property name="topMargin">
              <number>0</number>
             </property>
            </layout>
           </item>
          </layout>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KMessageWidget</class>
    <extends>QWidget</extends>
-   <header>kmessagewidget.h</header>
+   <header location="global">kmessagewidget.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KUrlRequester</class>
+   <extends>QWidget</extends>
+   <header location="global">kurlrequester.h</header>
+   <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>