diff options
| author | Orgad Shaneh <orgads@gmail.com> | 2012-03-28 22:23:03 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@nokia.com> | 2012-04-02 12:04:48 +0200 |
| commit | 9270d858c1f834355b9eed31dbe7febbe98d5cb5 (patch) | |
| tree | 18bd00e528fae363fa74ed727b38f42a192d4e6c /src/plugins/projectexplorer/projectexplorer.cpp | |
| parent | 12236050b9501d4b9bda746e6cf4ef7062e8e963 (diff) | |
| download | qt-creator-9270d858c1f834355b9eed31dbe7febbe98d5cb5.tar.gz | |
Compile output: Add 'Cancel Build' button
Change-Id: Ib633c172f3e5a79818ac737016948cbeda82ac41
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/projectexplorer/projectexplorer.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/projectexplorer.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index ca12fed0db..9f64737e1e 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -376,13 +376,6 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er addAutoReleasedObject(new CopyTaskHandler); addAutoReleasedObject(new ShowInEditorTaskHandler); addAutoReleasedObject(new VcsAnnotateTaskHandler); - - d->m_buildManager = new BuildManager(this); - connect(d->m_buildManager, SIGNAL(buildStateChanged(ProjectExplorer::Project*)), - this, SLOT(buildStateChanged(ProjectExplorer::Project*))); - connect(d->m_buildManager, SIGNAL(buildQueueFinished(bool)), - this, SLOT(buildQueueFinished(bool))); - addAutoReleasedObject(new CoreListener); d->m_outputPane = new AppOutputPane; @@ -798,7 +791,9 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er mbuild->addAction(cmd, Constants::G_BUILD_RUN); // cancel build action - d->m_cancelBuildAction = new QAction(tr("Cancel Build"), this); + QIcon stopIcon = QIcon(QLatin1String(Constants::ICON_STOP)); + stopIcon.addFile(QLatin1String(Constants::ICON_STOP_SMALL)); + d->m_cancelBuildAction = new QAction(stopIcon, tr("Cancel Build"), this); cmd = am->registerAction(d->m_cancelBuildAction, Constants::CANCELBUILD, globalcontext); mbuild->addAction(cmd, Constants::G_BUILD_CANCEL); @@ -1003,6 +998,12 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er connect(this, SIGNAL(updateRunActions()), this, SLOT(slotUpdateRunActions())); connect(this, SIGNAL(settingsChanged()), this, SLOT(updateRunWithoutDeployMenu())); + d->m_buildManager = new BuildManager(this, d->m_cancelBuildAction); + connect(d->m_buildManager, SIGNAL(buildStateChanged(ProjectExplorer::Project*)), + this, SLOT(buildStateChanged(ProjectExplorer::Project*))); + connect(d->m_buildManager, SIGNAL(buildQueueFinished(bool)), + this, SLOT(buildQueueFinished(bool))); + updateActions(); connect(Core::ICore::instance(), SIGNAL(coreAboutToOpen()), |