1 files changed, 6 insertions, 7 deletions
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index c8b677e002..c0e55fd5f2 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -122,9 +122,9 @@ QString QMakeStep::allArguments(bool shorted)
     if (bc->subNodeBuild())
         arguments << QDir::toNativeSeparators(bc->subNodeBuild()->path());
     else if (shorted)
-        arguments << QDir::toNativeSeparators(QFileInfo(project()->document()->fileName()).fileName());
+        arguments << QDir::toNativeSeparators(QFileInfo(project()->projectFilePath()).fileName());
     else
-        arguments << QDir::toNativeSeparators(project()->document()->fileName());
+        arguments << QDir::toNativeSeparators(project()->projectFilePath());
 
     arguments << QLatin1String("-r");
     bool userProvidedMkspec = false;
@@ -248,7 +248,7 @@ bool QMakeStep::init()
     if (qt4bc->subNodeBuild())
         workingDirectory = qt4bc->subNodeBuild()->buildDir();
     else
-        workingDirectory = qt4bc->buildDirectory();
+        workingDirectory = qt4bc->buildDirectory().toString();
 
     FileName program = qtVersion->qmakeCommand();
 
@@ -649,11 +649,10 @@ void QMakeStepConfigWidget::recompileMessageBoxFinished(int button)
             return;
 
         QList<ProjectExplorer::BuildStepList *> stepLists;
-        const Core::Id clean = Core::Id(ProjectExplorer::Constants::BUILDSTEPS_CLEAN);
-        const Core::Id build = Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
+        const Core::Id clean = ProjectExplorer::Constants::BUILDSTEPS_CLEAN;
+        const Core::Id build = ProjectExplorer::Constants::BUILDSTEPS_BUILD;
         stepLists << bc->stepList(clean) << bc->stepList(build);
-        ProjectExplorer::BuildManager *bm = ProjectExplorerPlugin::instance()->buildManager();
-        bm->buildLists(stepLists, QStringList() << ProjectExplorerPlugin::displayNameForStepId(clean)
+        BuildManager::buildLists(stepLists, QStringList() << ProjectExplorerPlugin::displayNameForStepId(clean)
                        << ProjectExplorerPlugin::displayNameForStepId(build));
     }
 }