1 files changed, 4 insertions, 9 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
index b44ae9fba3..b8ec73c314 100644
--- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
@@ -103,7 +103,7 @@ FilePath QmakeBuildConfiguration::shadowBuildDirectory(const FilePath &proFilePa
 
 const char BUILD_CONFIGURATION_KEY[] = "Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration";
 
-QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Core::Id id)
+QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Utils::Id id)
     : BuildConfiguration(target, id)
 {
     setConfigWidgetDisplayName(tr("General"));
@@ -313,7 +313,7 @@ void QmakeBuildConfiguration::updateProblemLabel()
                 }
                 if (!text.endsWith(QLatin1String("br>")))
                     text.append(QLatin1String("<br>"));
-                text.append(type + task.description);
+                text.append(type + task.description());
             }
             buildDirectoryAspect()->setProblem(text);
             return;
@@ -424,11 +424,6 @@ TriState QmakeBuildConfiguration::qmlDebugging() const
     return aspect<QmlDebuggingAspect>()->setting();
 }
 
-bool QmakeBuildConfiguration::linkQmlDebuggingLibrary() const
-{
-    return qmlDebugging() == TriState::Enabled;
-}
-
 void QmakeBuildConfiguration::forceQmlDebugging(bool enable)
 {
     aspect<QmlDebuggingAspect>()->setSetting(enable ? TriState::Enabled : TriState::Disabled);
@@ -829,7 +824,7 @@ QmakeBuildConfiguration::LastKitState::LastKitState(Kit *k)
       m_sysroot(SysRootKitAspect::sysRoot(k).toString()),
       m_mkspec(QmakeKitAspect::mkspec(k))
 {
-    ToolChain *tc = ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID);
+    ToolChain *tc = ToolChainKitAspect::cxxToolChain(k);
     m_toolchain = tc ? tc->id() : QByteArray();
 }
 
@@ -855,7 +850,7 @@ bool QmakeBuildConfiguration::regenerateBuildFiles(Node *node)
     qs->setForced(true);
 
     BuildManager::buildList(cleanSteps());
-    BuildManager::appendStep(qs, ProjectExplorerPlugin::displayNameForStepId(ProjectExplorer::Constants::BUILDSTEPS_CLEAN));
+    BuildManager::appendStep(qs, BuildManager::displayNameForStepId(ProjectExplorer::Constants::BUILDSTEPS_CLEAN));
 
     QmakeProFileNode *proFile = nullptr;
     if (node && node != target()->project()->rootProjectNode())