diff options
author | Tobias Hunger <tobias.hunger@nokia.com> | 2010-07-08 11:09:28 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@nokia.com> | 2010-07-12 14:45:51 +0200 |
commit | 223a1df854e77a996b5181eb5703d0eef2a750bb (patch) | |
tree | a5f219e46295ffdcb90cff3c6f18f9a4df135597 /src/plugins/projectexplorer/buildmanager.cpp | |
parent | 43a7cbc1fe36153bc789d4892e855973462b5c2d (diff) | |
download | qt-creator-223a1df854e77a996b5181eb5703d0eef2a750bb.tar.gz |
Wire in Deployment logic
Diffstat (limited to 'src/plugins/projectexplorer/buildmanager.cpp')
-rw-r--r-- | src/plugins/projectexplorer/buildmanager.cpp | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index dc58861cab..ad2742dac7 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -414,12 +414,26 @@ bool BuildManager::buildQueueAppend(QList<BuildStep *> steps) void BuildManager::buildProjects(const QList<BuildConfiguration *> &configurations) { QList<BuildStep *> steps; - foreach(BuildConfiguration *bc, configurations) { + foreach(BuildConfiguration *bc, configurations) steps.append(bc->steps(BuildStep::Build)); - // TODO: Verify that this is indeed what we want. - steps.append(bc->steps(BuildStep::Deploy)); + + bool success = buildQueueAppend(steps); + if (!success) { + m_outputWindow->popup(false); + return; } + if (ProjectExplorerPlugin::instance()->projectExplorerSettings().showCompilerOutput) + m_outputWindow->popup(false); + startBuildQueue(); +} + +void BuildManager::deployProjects(const QList<BuildConfiguration *> &configurations) +{ + QList<BuildStep *> steps; + foreach(BuildConfiguration *bc, configurations) + steps.append(bc->steps(BuildStep::Deploy)); + bool success = buildQueueAppend(steps); if (!success) { m_outputWindow->popup(false); @@ -453,6 +467,11 @@ void BuildManager::buildProject(BuildConfiguration *configuration) buildProjects(QList<BuildConfiguration *>() << configuration); } +void BuildManager::deployProject(BuildConfiguration *configuration) +{ + deployProjects(QList<BuildConfiguration *>() << configuration); +} + void BuildManager::cleanProject(BuildConfiguration *configuration) { cleanProjects(QList<BuildConfiguration *>() << configuration); |