diff --git a/projectmanagers/qmake/qmakejob.cpp b/projectmanagers/qmake/qmakejob.cpp
index b4f6cec247..dfaf753de0 100644
--- a/projectmanagers/qmake/qmakejob.cpp
+++ b/projectmanagers/qmake/qmakejob.cpp
@@ -1,163 +1,163 @@
 /***************************************************************************
  *   This file is part of KDevelop                                         *
  *   Copyright 2010 Milian Wolff <mail@milianw.de>                         *
  *                                                                         *
  *   This program 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 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 Library General Public     *
  *   License along with this program; if not, write to the                 *
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "qmakejob.h"
 #include <QtCore/QFileInfo>
 #include <QtCore/QDir>
 #include <QDebug>
 #include <QProcess>
 #include <KLocalizedString>
 #include <KShell>
 #include <util/processlinemaker.h>
 #include <util/environmentgrouplist.h>
 #include <outputview/outputmodel.h>
 #include <outputview/ioutputview.h>
 #include "debug.h"
 
 using namespace KDevelop;
 
 QMakeJob::QMakeJob(QString srcDir, QString buildDir, QObject* parent)
     : OutputJob(parent)
     , m_srcDir(std::move(srcDir))
     , m_buildDir(std::move(buildDir))
     , m_qmakePath("qmake")
     , m_buildType(0)
     , m_process(nullptr)
     , m_model(nullptr)
 
 {
     setCapabilities(Killable);
     setStandardToolView(IOutputView::RunView);
     setBehaviours(IOutputView::AllowUserClose | IOutputView::AutoScroll);
 
     setObjectName(i18n("Run QMake in %1", m_buildDir));
 }
 
 QMakeJob::~QMakeJob()
 {
 }
 
 void QMakeJob::setQMakePath(const QString& path)
 {
     m_qmakePath = path;
 }
 
 void QMakeJob::setInstallPrefix(const QString& prefix)
 {
     m_installPrefix = prefix;
 }
 
 void QMakeJob::setBuildType(int comboboxSelectedIndex)
 {
     m_buildType = comboboxSelectedIndex;
 }
 
 void QMakeJob::setExtraArguments(const QString& args)
 {
     m_extraArguments = args;
 }
 
 void QMakeJob::start()
 {
     static const char* BUILD_TYPES[] = { "debug", "build", "(don't specify)" };
 
     m_model = new OutputModel;
     setModel(m_model);
 
     startOutput();
 
     QStringList args;
     if (m_buildType < 2)
         args << QString("CONFIG+=") + BUILD_TYPES[m_buildType];
     if (!m_installPrefix.isEmpty())
         args << "target.path=" + m_installPrefix;
     if (!m_extraArguments.isEmpty()) {
         KShell::Errors err;
         QStringList tmp = KShell::splitArgs(m_extraArguments, KShell::TildeExpand | KShell::AbortOnMeta, &err);
         if (err == KShell::NoError) {
             args += tmp;
         } else {
             qCWarning(KDEV_QMAKE) << "Ignoring qmake Extra arguments";
             if (err == KShell::BadQuoting) {
                 qCWarning(KDEV_QMAKE) << "QMake arguments badly quoted:" << m_extraArguments;
             } else {
                 qCWarning(KDEV_QMAKE) << "QMake arguments had meta character:" << m_extraArguments;
             }
         }
     }
     args << "-r" << m_srcDir;
 
     m_model->appendLine(m_buildDir + ": " + args.join(" "));
 
     QDir build(m_buildDir);
     if (!build.exists()) {
         build.mkpath(build.absolutePath());
     }
 
     m_process = new QProcess(this);
-    KDevPlatform::restoreSystemEnvironment(m_process);
+    KDevelop::restoreSystemEnvironment(m_process);
     m_process->setWorkingDirectory(m_buildDir);
     m_process->setProgram(m_qmakePath);
     m_process->setArguments(args);
     m_process->setProcessChannelMode(QProcess::MergedChannels);
     auto lineMaker = new KDevelop::ProcessLineMaker(m_process, this);
 
     connect(lineMaker, SIGNAL(receivedStdoutLines(QStringList)), m_model, SLOT(appendLines(QStringList)));
     connect(lineMaker, SIGNAL(receivedStderrLines(QStringList)), m_model, SLOT(appendLines(QStringList)));
     connect(m_process, SIGNAL(error(QProcess::ProcessError)), SLOT(processError(QProcess::ProcessError)));
     connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(processFinished(int, QProcess::ExitStatus)));
 
     m_process->start();
 }
 
 bool QMakeJob::doKill()
 {
     if (!m_process) {
         return true;
     }
 
     m_process->kill();
     return m_process->state() == m_process->NotRunning;
 }
 
 QString QMakeJob::errorString() const
 {
     return m_process->errorString();
 }
 
 void QMakeJob::processError(QProcess::ProcessError error)
 {
     m_model->appendLine(errorString());
     setError(error);
     emitResult();
 }
 
 void QMakeJob::processFinished(int exitCode, QProcess::ExitStatus status)
 {
     if (status == QProcess::NormalExit) {
         m_model->appendLine(i18n("*** Exited with return code: %1 ***", exitCode));
     } else if (error() == KJob::KilledJobError) {
         m_model->appendLine(i18n("*** Process aborted ***"));
     } else {
         m_model->appendLine(i18n("*** Crashed with return code: %1 ***", exitCode));
     }
 
     emitResult();
 }