diff options
Diffstat (limited to 'src/plugins')
5 files changed, 16 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index 461cfef624..6679199ead 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -333,6 +333,8 @@ void BuildManager::buildProjects(const QList<Project *> &projects, const QList<Q } } startBuildQueue(); + if (ProjectExplorerPlugin::instance()->projectExplorerSettings().showCompilerOutput) + m_outputWindow->popup(false); } void BuildManager::cleanProjects(const QList<Project *> &projects, const QList<QString> &configurations) @@ -349,6 +351,8 @@ void BuildManager::cleanProjects(const QList<Project *> &projects, const QList<Q } } startBuildQueue(); + if (ProjectExplorerPlugin::instance()->projectExplorerSettings().showCompilerOutput) + m_outputWindow->popup(false); } void BuildManager::buildProject(Project *p, const QString &configuration) diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index e2cf36bd24..ea065c5394 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -644,6 +644,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er if (QSettings *s = core->settings()) { m_projectExplorerSettings.buildBeforeRun = s->value("ProjectExplorer/Settings/BuildBeforeRun", true).toBool(); m_projectExplorerSettings.saveBeforeBuild = s->value("ProjectExplorer/Settings/SaveBeforeBuild", false).toBool(); + m_projectExplorerSettings.showCompilerOutput = s->value("ProjectExplorer/Settings/ShowCompilerOutput", false).toBool(); } if (Core::Internal::WelcomeMode *welcomeMode = qobject_cast<Core::Internal::WelcomeMode*> @@ -887,6 +888,7 @@ void ProjectExplorerPlugin::savePersistentSettings() s->setValue("ProjectExplorer/Settings/BuildBeforeRun", m_projectExplorerSettings.buildBeforeRun); s->setValue("ProjectExplorer/Settings/SaveBeforeBuild", m_projectExplorerSettings.saveBeforeBuild); + s->setValue("ProjectExplorer/Settings/ShowCompilerOutput", m_projectExplorerSettings.showCompilerOutput); } } diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h index 2b5bf46676..78c1d3c3ba 100644 --- a/src/plugins/projectexplorer/projectexplorer.h +++ b/src/plugins/projectexplorer/projectexplorer.h @@ -78,6 +78,7 @@ struct ProjectExplorerSettings { bool buildBeforeRun; bool saveBeforeBuild; + bool showCompilerOutput; }; } // namespace Internal diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.cpp b/src/plugins/projectexplorer/projectexplorersettingspage.cpp index 53df7ac328..38b0964a89 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.cpp +++ b/src/plugins/projectexplorer/projectexplorersettingspage.cpp @@ -72,6 +72,7 @@ QWidget *ProjectExplorerSettingsPage::createPage(QWidget *parent) ProjectExplorerSettings pes = ProjectExplorerPlugin::instance()->projectExplorerSettings(); m_ui.buildProjectBeforeRunCheckBox->setChecked(pes.buildBeforeRun); m_ui.saveAllFilesCheckBox->setChecked(pes.saveBeforeBuild); + m_ui.showCompileOutputCheckBox->setChecked(pes.showCompilerOutput); return w; } @@ -80,6 +81,7 @@ void ProjectExplorerSettingsPage::apply() ProjectExplorerSettings pes; pes.buildBeforeRun = m_ui.buildProjectBeforeRunCheckBox->isChecked(); pes.saveBeforeBuild = m_ui.saveAllFilesCheckBox->isChecked(); + pes.showCompilerOutput = m_ui.showCompileOutputCheckBox->isChecked(); ProjectExplorerPlugin::instance()->setProjectExplorerSettings(pes); } diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.ui b/src/plugins/projectexplorer/projectexplorersettingspage.ui index f3cfc1fe74..b56006ba6b 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.ui +++ b/src/plugins/projectexplorer/projectexplorersettingspage.ui @@ -31,6 +31,13 @@ </property> </widget> </item> + <item> + <widget class="QCheckBox" name="showCompileOutputCheckBox"> + <property name="text"> + <string>Show Compiler Output on building</string> + </property> + </widget> + </item> </layout> </widget> </item> |