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

ProjectExplorerSettings: Keep environmentId.

Browse Source 
Make sure to not change the environmentId when editing something
in the settings page.

Task-number: QTCREATORBUG-9359
Change-Id: I7fc891cb3a69f08b1c2ea3f963a2deb01ddca9b2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2013-06-03 12:56:49 +02:00
parent 078942b767
commit 2af8faeb91
4 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -3018,6 +3018,8 @@ void ProjectExplorerPlugin::setSession(QAction *action)
void ProjectExplorerPlugin::setProjectExplorerSettings(const Internal::ProjectExplorerSettings &pes) void ProjectExplorerPlugin::setProjectExplorerSettings(const Internal::ProjectExplorerSettings &pes)
{ {
QTC_ASSERT(d->m_projectExplorerSettings.environmentId == pes.environmentId, return);
if (d->m_projectExplorerSettings == pes) if (d->m_projectExplorerSettings == pes)
return; return;
d->m_projectExplorerSettings = pes; d->m_projectExplorerSettings = pes;

3
src/plugins/projectexplorer/projectexplorersettings.h
View File

@@ -81,7 +81,8 @@ inline bool operator==(const ProjectExplorerSettings &p1, const ProjectExplorerS
&& p1.useJom == p2.useJom && p1.useJom == p2.useJom
&& p1.autorestoreLastSession == p2.autorestoreLastSession && p1.autorestoreLastSession == p2.autorestoreLastSession
&& p1.prompToStopRunControl == p2.prompToStopRunControl && p1.prompToStopRunControl == p2.prompToStopRunControl
&& p1.maxAppOutputLines == p2.maxAppOutputLines; && p1.maxAppOutputLines == p2.maxAppOutputLines
&& p1.environmentId == p2.environmentId;
} }
} // namespace ProjectExplorer } // namespace ProjectExplorer

2
src/plugins/projectexplorer/projectexplorersettingspage.cpp
View File

@@ -81,6 +81,7 @@ ProjectExplorerSettings ProjectExplorerSettingsWidget::settings() const
pes.useJom = m_ui.jomCheckbox->isChecked(); pes.useJom = m_ui.jomCheckbox->isChecked();
pes.prompToStopRunControl = m_ui.promptToStopRunControlCheckBox->isChecked(); pes.prompToStopRunControl = m_ui.promptToStopRunControlCheckBox->isChecked();
pes.maxAppOutputLines = m_ui.maxAppOutputBox->value(); pes.maxAppOutputLines = m_ui.maxAppOutputBox->value();
pes.environmentId = m_environmentId;
return pes; return pes;
} }
@@ -98,6 +99,7 @@ void ProjectExplorerSettingsWidget::setSettings(const ProjectExplorerSettings &
m_ui.jomCheckbox->setChecked(pes.useJom); m_ui.jomCheckbox->setChecked(pes.useJom);
m_ui.promptToStopRunControlCheckBox->setChecked(pes.prompToStopRunControl); m_ui.promptToStopRunControlCheckBox->setChecked(pes.prompToStopRunControl);
m_ui.maxAppOutputBox->setValue(pes.maxAppOutputLines); m_ui.maxAppOutputBox->setValue(pes.maxAppOutputLines);
m_environmentId = pes.environmentId;
} }
QString ProjectExplorerSettingsWidget::projectsDirectory() const QString ProjectExplorerSettingsWidget::projectsDirectory() const

2
src/plugins/projectexplorer/projectexplorersettingspage.h
View File

@@ -34,6 +34,7 @@
#include "ui_projectexplorersettingspage.h" #include "ui_projectexplorersettingspage.h"
#include <QPointer> #include <QPointer>
#include <QUuid>
namespace ProjectExplorer { namespace ProjectExplorer {
namespace Internal { namespace Internal {
@@ -70,6 +71,7 @@ private:
Ui::ProjectExplorerSettingsPageUi m_ui; Ui::ProjectExplorerSettingsPageUi m_ui;
mutable QString m_searchKeywords; mutable QString m_searchKeywords;
QUuid m_environmentId;
}; };
class ProjectExplorerSettingsPage : public Core::IOptionsPage class ProjectExplorerSettingsPage : public Core::IOptionsPage