feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

compile fix

Browse Source 
Change-Id: I619b710c403ed365b1e7b63bc8fdf0a2b853d9c8
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-07-26 14:15:13 +02:00
parent fafda6354b
commit 42a26ad450
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/makestep.cpp
View File

@@ -147,7 +147,7 @@ bool MakeStep::init()
if (!bc) { if (!bc) {
m_tasks.append(Task(Task::Error, tr("Qt Creator needs a build configuration set up to build. Configure a tool chain in Project mode."), m_tasks.append(Task(Task::Error, tr("Qt Creator needs a build configuration set up to build. Configure a tool chain in Project mode."),
Utils::FileName(), -1, Utils::FileName(), -1,
Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM))); Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
return false; return false;
} }
@@ -155,7 +155,7 @@ bool MakeStep::init()
if (!tc) { if (!tc) {
m_tasks.append(Task(Task::Error, tr("Qt Creator needs a tool chain set up to build. Configure a tool chain the profile options."), m_tasks.append(Task(Task::Error, tr("Qt Creator needs a tool chain set up to build. Configure a tool chain the profile options."),
Utils::FileName(), -1, Utils::FileName(), -1,
Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM))); Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
return false; return false;
} }
@@ -528,7 +528,7 @@ BuildStep *MakeStepFactory::create(BuildStepList *parent, const Core::Id id)
if (!canCreate(parent, id)) if (!canCreate(parent, id))
return 0; return 0;
MakeStep *step = new MakeStep(parent); MakeStep *step = new MakeStep(parent);
if (parent->id() == Core::Id(Constants::BUILDSTEPS_CLEAN)) { if (parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)) {
step->setClean(true); step->setClean(true);
step->setUserArguments(QLatin1String("clean")); step->setUserArguments(QLatin1String("clean"));
} }

2
src/plugins/qt4projectmanager/makestep.h
View File

@@ -39,9 +39,7 @@
namespace ProjectExplorer { namespace ProjectExplorer {
class BuildStep; class BuildStep;
class GnuMakeParser;
class IBuildStepFactory; class IBuildStepFactory;
class Project;
} }
namespace Qt4ProjectManager { namespace Qt4ProjectManager {