diff --git a/plugins/meson/settings/mesonnewbuilddir.cpp b/plugins/meson/settings/mesonnewbuilddir.cpp
index a0300c5bb4..c4ba8b2f8f 100644
--- a/plugins/meson/settings/mesonnewbuilddir.cpp
+++ b/plugins/meson/settings/mesonnewbuilddir.cpp
@@ -1,211 +1,218 @@
 /* This file is part of KDevelop
     Copyright 2018 Daniel Mensinger <daniel@mensinger-ka.de>
 
     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 "mesonnewbuilddir.h"
 #include "mesonbuilder.h"
 #include "mesonmanager.h"
 #include "ui_mesonnewbuilddir.h"
 
 #include <interfaces/icore.h>
 #include <interfaces/iproject.h>
 #include <interfaces/iruncontroller.h>
 #include <interfaces/iruntime.h>
 #include <interfaces/iruntimecontroller.h>
 #include <project/helper.h>
 
 #include <QDialogButtonBox>
 #include <QFileInfo>
 #include <algorithm>
 #include <debug.h>
 #include <kcolorscheme.h>
+#include <kio_version.h>
 
 using namespace KDevelop;
 
 MesonNewBuildDir::MesonNewBuildDir(IProject* project, QWidget* parent)
     : QDialog(parent)
     , m_project(project)
 {
     Q_ASSERT(project); // Just in case
     MesonManager* mgr = dynamic_cast<MesonManager*>(m_project->buildSystemManager());
     Q_ASSERT(mgr); // This dialog only works with the MesonManager
 
     setWindowTitle(
         i18n("Configure a build directory - %1", ICore::self()->runtimeController()->currentRuntime()->name()));
 
     m_ui = new Ui::MesonNewBuildDir;
     m_ui->setupUi(this);
 
     m_ui->advanced->setSupportedBackends(mgr->supportedMesonBackends());
 
     connect(m_ui->b_buttonBox, &QDialogButtonBox::clicked, this, [this](QAbstractButton* b) {
         if (m_ui->b_buttonBox->buttonRole(b) == QDialogButtonBox::ResetRole) {
             resetFields();
         }
     });
 
+#if KIO_VERSION >= QT_VERSION_CHECK(5, 33, 0)
+    m_ui->i_buildDir->setAcceptMode(QFileDialog::AcceptSave);
+#else
+    m_ui->i_buildDir->fileDialog()->setAcceptMode(QFileDialog::AcceptSave);
+#endif
+
     resetFields();
 }
 
 MesonNewBuildDir::~MesonNewBuildDir()
 {
     delete m_ui;
 }
 
 void MesonNewBuildDir::resetFields()
 {
     Meson::MesonConfig cfg = Meson::getMesonConfig(m_project);
     Path projectPath = m_project->path();
     MesonManager* mgr = dynamic_cast<MesonManager*>(m_project->buildSystemManager());
     Q_ASSERT(mgr); // This dialog only works with the MesonManager
 
     auto aConf = m_ui->advanced->getConfig();
 
     // Find a build dir that is not already configured
     Path buildDirPath = projectPath;
     buildDirPath.addPath(QStringLiteral("build"));
 
     auto checkInCfg = [](Meson::MesonConfig const& cfg, Path const& p) -> bool {
         for (auto const& i : cfg.buildDirs) {
             if (i.buildDir == p) {
                 return true;
             }
         }
         return false;
     };
 
     for (int i = 2; checkInCfg(cfg, buildDirPath); ++i) {
         buildDirPath = projectPath;
         buildDirPath.addPath(QStringLiteral("build%1").arg(i));
     }
 
     m_ui->i_buildDir->setUrl(buildDirPath.toUrl());
 
     // Init build type
     // TODO use introspection once https://github.com/mesonbuild/meson/pull/4564 is merged
     QStringList buildTypes = { QStringLiteral("plain"),   QStringLiteral("debug"),   QStringLiteral("debugoptimized"),
                                QStringLiteral("release"), QStringLiteral("minsize"), QStringLiteral("custom") };
 
     m_ui->i_buildType->clear();
     m_ui->i_buildType->addItems(buildTypes);
     m_ui->i_buildType->setCurrentIndex(std::max(0, buildTypes.indexOf(QStringLiteral("debug"))));
 
     // Install prefix
     m_ui->i_installPrefix->clear();
 
     // Extra args
     aConf.args.clear();
 
     // Backend
     aConf.backend = mgr->defaultMesonBackend();
 
     // Meson exe
     aConf.meson = mgr->findMeson();
 
     m_ui->advanced->setConfig(aConf);
     updated();
 }
 
 void MesonNewBuildDir::setStatus(const QString& str, bool validConfig)
 {
     m_configIsValid = validConfig;
 
     KColorScheme scheme(QPalette::Normal);
     KColorScheme::ForegroundRole role;
     if (validConfig) {
         role = KColorScheme::PositiveText;
     } else {
         role = KColorScheme::NegativeText;
     }
 
     QPalette pal = m_ui->l_statusMessage->palette();
     pal.setColor(QPalette::Foreground, scheme.foreground(role).color());
     m_ui->l_statusMessage->setPalette(pal);
     m_ui->l_statusMessage->setText(str);
 
     auto okButton = m_ui->b_buttonBox->button(QDialogButtonBox::Ok);
     okButton->setEnabled(m_configIsValid);
     if (m_configIsValid) {
         auto cancelButton = m_ui->b_buttonBox->button(QDialogButtonBox::Cancel);
         cancelButton->clearFocus();
     }
 }
 
 void MesonNewBuildDir::updated()
 {
     auto advanced = m_ui->advanced->getConfig();
     Path buildDir = Path(m_ui->i_buildDir->url());
     QFileInfo mesonExe(advanced.meson.toLocalFile());
 
     if (!mesonExe.exists() || !mesonExe.isExecutable()
         || !mesonExe.permission(QFileDevice::ReadUser | QFileDevice::ExeUser)) {
         setStatus(i18n("Specified meson executable does not exist"), false);
         return;
     }
 
     MesonBuilder::DirectoryStatus status = MesonBuilder::evaluateBuildDirectory(buildDir, advanced.backend);
     switch (status) {
     case MesonBuilder::CLEAN:
     case MesonBuilder::DOES_NOT_EXIST:
         setStatus(i18n("Creating new build directory"), true);
         break;
     case MesonBuilder::MESON_CONFIGURED:
         setStatus(i18n("Using an already configured build directory"), true);
         break;
     case MesonBuilder::MESON_FAILED_CONFIGURATION:
         setStatus(i18n("Using a broken meson build directory (this should be fine)"), true);
         break;
     case MesonBuilder::INVALID_BUILD_DIR:
         setStatus(i18n("Cannot use specified directory"), false);
         break;
     case MesonBuilder::DIR_NOT_EMPTY:
         setStatus(i18n("There are already files in the build directory"), false);
         break;
     case MesonBuilder::EMPTY_STRING:
         setStatus(i18n("The build directory field must not be empty"), false);
         break;
     case MesonBuilder::___UNDEFINED___:
         setStatus(i18n("You have reached unreachable code. This is a bug"), false);
         break;
     }
 }
 
 Meson::BuildDir MesonNewBuildDir::currentConfig() const
 {
     Meson::BuildDir buildDir;
     if (!m_configIsValid) {
         qCDebug(KDEV_Meson) << "Cannot generate build dir config from invalid config";
         return buildDir;
     }
 
     auto advanced = m_ui->advanced->getConfig();
 
     buildDir.buildDir = Path(m_ui->i_buildDir->url());
     buildDir.buildType = m_ui->i_buildType->currentText();
     buildDir.installPrefix = Path(m_ui->i_installPrefix->url());
     buildDir.mesonArgs = advanced.args;
     buildDir.mesonBackend = advanced.backend;
     buildDir.mesonExecutable = advanced.meson;
 
     return buildDir;
 }
 
 bool MesonNewBuildDir::isConfigValid() const
 {
     return m_configIsValid;
 }
diff --git a/plugins/meson/settings/mesonnewbuilddir.ui b/plugins/meson/settings/mesonnewbuilddir.ui
index d02c649334..b7d87237ce 100644
--- a/plugins/meson/settings/mesonnewbuilddir.ui
+++ b/plugins/meson/settings/mesonnewbuilddir.ui
@@ -1,260 +1,257 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>MesonNewBuildDir</class>
  <widget class="QDialog" name="MesonNewBuildDir">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>650</width>
     <height>625</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="c_01_basic">
      <property name="title">
       <string>Basic configuration</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="0">
        <widget class="QLabel" name="l_buildDir">
         <property name="text">
          <string>Build directory:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="l_installPrefix">
         <property name="text">
          <string>Installation prefix:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="KUrlRequester" name="i_buildDir">
         <property name="mode">
          <set>KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly</set>
         </property>
-        <property name="acceptMode">
-         <enum>QFileDialog::AcceptSave</enum>
-        </property>
         <property name="placeholderText">
          <string>Full Path to the new build directory</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="l_buildType">
         <property name="text">
          <string>Build type:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="KComboBox" name="i_buildType"/>
       </item>
       <item row="2" column="1">
        <widget class="KUrlRequester" name="i_installPrefix">
         <property name="mode">
          <set>KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly</set>
         </property>
         <property name="placeholderText">
          <string>Full path to the installation prefix</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="c_02_buildConfig">
      <property name="enabled">
       <bool>true</bool>
      </property>
      <property name="title">
       <string>Build configuration</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <widget class="QScrollArea" name="scrollArea">
         <property name="widgetResizable">
          <bool>true</bool>
         </property>
         <widget class="QWidget" name="scrollAreaWidgetContents">
          <property name="geometry">
           <rect>
            <x>0</x>
            <y>0</y>
            <width>618</width>
            <height>353</height>
           </rect>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_2">
           <item>
            <widget class="QLabel" name="l_TODO">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="text">
              <string>TODO -- Implement in separate UI file</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignCenter</set>
             </property>
            </widget>
           </item>
           <item>
            <spacer name="verticalSpacer">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>0</width>
               <height>0</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </widget>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="MesonAdvancedSettings" name="advanced" native="true"/>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLabel" name="l_statusMessage">
        <property name="text">
         <string>Status message...</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QDialogButtonBox" name="b_buttonBox">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="standardButtons">
         <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
        </property>
       </widget>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
    <header>kurlrequester.h</header>
   </customwidget>
   <customwidget>
    <class>MesonAdvancedSettings</class>
    <extends>QWidget</extends>
    <header>settings/mesonadvancedsettings.h</header>
    <container>1</container>
    <slots>
     <signal>configChanged()</signal>
    </slots>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>b_buttonBox</sender>
    <signal>accepted()</signal>
    <receiver>MesonNewBuildDir</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>564</x>
      <y>643</y>
     </hint>
     <hint type="destinationlabel">
      <x>329</x>
      <y>333</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>b_buttonBox</sender>
    <signal>rejected()</signal>
    <receiver>MesonNewBuildDir</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>564</x>
      <y>643</y>
     </hint>
     <hint type="destinationlabel">
      <x>329</x>
      <y>333</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>i_buildDir</sender>
    <signal>textChanged(QString)</signal>
    <receiver>MesonNewBuildDir</receiver>
    <slot>updated()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>383</x>
      <y>55</y>
     </hint>
     <hint type="destinationlabel">
      <x>324</x>
      <y>312</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>advanced</sender>
    <signal>configChanged()</signal>
    <receiver>MesonNewBuildDir</receiver>
    <slot>updated()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>324</x>
      <y>571</y>
     </hint>
     <hint type="destinationlabel">
      <x>324</x>
      <y>312</y>
     </hint>
    </hints>
   </connection>
  </connections>
  <slots>
   <slot>resetFields()</slot>
   <slot>updated()</slot>
  </slots>
 </ui>