From e02dae3efb5ebcb1aa8c946323ab902d3ca8281f Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Fri, 29 Oct 2010 13:40:30 +0200
Subject: [PATCH] Enable/disable RCconfig widgets in constructor
---
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp | 2 +-
.../qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp | 2 ++
.../qt-s60/s60devicerunconfigurationwidget.cpp | 2 ++
.../qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp | 2 ++
src/plugins/qt4projectmanager/qt4runconfiguration.cpp | 2 ++
5 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
index 2843ecc4385..12605ea0ed8 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
@@ -331,7 +331,6 @@ bool CMakeRunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration *bc) c
CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *cmakeRunConfiguration, QWidget *parent)
: QWidget(parent), m_ignoreChange(false), m_cmakeRunConfiguration(cmakeRunConfiguration)
{
-
QFormLayout *fl = new QFormLayout();
fl->setMargin(0);
fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
@@ -438,6 +437,7 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
connect(m_cmakeRunConfiguration, SIGNAL(userEnvironmentChangesChanged(QList<Utils::EnvironmentItem>)),
this, SLOT(userEnvironmentChangesChanged()));
+ setEnabled(m_cmakeRunConfiguration->isEnabled());
}
void CMakeRunConfigurationWidget::setWorkingDirectory()
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
index 1be512c501a..d2a8799e924 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
@@ -101,6 +101,8 @@ MaemoRunConfigurationWidget::MaemoRunConfigurationWidget(
this, SLOT(runConfigurationEnabledChange(bool)));
handleBuildConfigChanged();
+
+ setEnabled(m_runConfiguration->isEnabled());
}
void MaemoRunConfigurationWidget::runConfigurationEnabledChange(bool enabled)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
index 2273d81c0f4..485d5dc7ce6 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
@@ -76,6 +76,8 @@ S60DeviceRunConfigurationWidget::S60DeviceRunConfigurationWidget(
connect(m_runConfiguration, SIGNAL(isEnabledChanged(bool)),
this, SLOT(runConfigurationEnabledChange(bool)));
+
+ setEnabled(m_runConfiguration->isEnabled());
}
void S60DeviceRunConfigurationWidget::argumentsEdited(const QString &text)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
index 9967d2aeb19..b1ae0127b78 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
@@ -235,6 +235,8 @@ S60EmulatorRunConfigurationWidget::S60EmulatorRunConfigurationWidget(S60Emulator
connect(m_runConfiguration, SIGNAL(isEnabledChanged(bool)),
this, SLOT(runConfigurationEnabledChange(bool)));
+
+ setEnabled(m_runConfiguration->isEnabled());
}
void S60EmulatorRunConfigurationWidget::updateTargetInformation()
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index e9ce1efd92e..5c414016d32 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -347,6 +347,8 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
connect(qt4RunConfiguration, SIGNAL(isEnabledChanged(bool)),
this, SLOT(runConfigurationEnabledChange(bool)));
+
+ setEnabled(qt4RunConfiguration->isEnabled());
}
Qt4RunConfigurationWidget::~Qt4RunConfigurationWidget()
--
GitLab