Commit 8f921b95 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Maemo: Remove outdated code.

This was left over from the time where there was only one kind
Target class for all Maemo-like target types.
parent c4c7bb89
...@@ -80,7 +80,6 @@ MaemoRunConfigurationWidget::MaemoRunConfigurationWidget( ...@@ -80,7 +80,6 @@ MaemoRunConfigurationWidget::MaemoRunConfigurationWidget(
m_deviceEnvReader(new MaemoDeviceEnvReader(this, runConfiguration)), m_deviceEnvReader(new MaemoDeviceEnvReader(this, runConfiguration)),
m_deployablesConnected(false) m_deployablesConnected(false)
{ {
m_lastActiveBuildConfig = m_runConfiguration->activeQt4BuildConfiguration();
QVBoxLayout *mainLayout = new QVBoxLayout; QVBoxLayout *mainLayout = new QVBoxLayout;
setLayout(mainLayout); setLayout(mainLayout);
addGenericWidgets(mainLayout); addGenericWidgets(mainLayout);
...@@ -92,14 +91,20 @@ MaemoRunConfigurationWidget::MaemoRunConfigurationWidget( ...@@ -92,14 +91,20 @@ MaemoRunConfigurationWidget::MaemoRunConfigurationWidget(
SIGNAL(deviceConfigurationChanged(ProjectExplorer::Target*)), SIGNAL(deviceConfigurationChanged(ProjectExplorer::Target*)),
this, SLOT(handleCurrentDeviceConfigChanged())); this, SLOT(handleCurrentDeviceConfigChanged()));
handleCurrentDeviceConfigChanged(); handleCurrentDeviceConfigChanged();
connect(m_runConfiguration->maemoTarget(),
SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)),
this, SLOT(handleBuildConfigChanged()));
connect(m_runConfiguration, SIGNAL(isEnabledChanged(bool)), connect(m_runConfiguration, SIGNAL(isEnabledChanged(bool)),
this, SLOT(runConfigurationEnabledChange(bool))); this, SLOT(runConfigurationEnabledChange(bool)));
handleBuildConfigChanged(); const AbstractQt4MaemoTarget * const maemoTarget
= runConfiguration->maemoTarget();
const bool remoteMountsAvailable = maemoTarget->allowsRemoteMounts();
m_debugDetailsContainer->setVisible(remoteMountsAvailable);
m_mountDetailsContainer->setVisible(remoteMountsAvailable);
const bool qmlDebuggingAvailable = maemoTarget->allowsQmlDebugging();
m_debuggingLanguagesLabel->setVisible(qmlDebuggingAvailable);
m_debugCppOnlyButton->setVisible(qmlDebuggingAvailable);
m_debugQmlOnlyButton->setVisible(qmlDebuggingAvailable);
m_debugCppAndQmlButton->setVisible(qmlDebuggingAvailable);
setEnabled(m_runConfiguration->isEnabled()); setEnabled(m_runConfiguration->isEnabled());
} }
...@@ -327,35 +332,6 @@ void MaemoRunConfigurationWidget::handleDeploySpecsChanged() ...@@ -327,35 +332,6 @@ void MaemoRunConfigurationWidget::handleDeploySpecsChanged()
m_runConfiguration->updateFactoryState(); m_runConfiguration->updateFactoryState();
} }
void MaemoRunConfigurationWidget::handleBuildConfigChanged()
{
if (m_lastActiveBuildConfig)
disconnect(m_lastActiveBuildConfig, 0, this, 0);
m_lastActiveBuildConfig = m_runConfiguration->activeQt4BuildConfiguration();
if (m_lastActiveBuildConfig) {
connect(m_lastActiveBuildConfig, SIGNAL(qtVersionChanged()), this,
SLOT(handleToolchainChanged()));
}
handleToolchainChanged();
}
void MaemoRunConfigurationWidget::handleToolchainChanged()
{
const AbstractQt4MaemoTarget * const maemoTarget
= m_runConfiguration->maemoTarget();
if (maemoTarget) {
const bool remoteMountsAvailable = maemoTarget->allowsRemoteMounts();
m_debugDetailsContainer->setVisible(remoteMountsAvailable);
m_mountDetailsContainer->setVisible(remoteMountsAvailable);
const bool qmlDebuggingAvailable = maemoTarget->allowsQmlDebugging();
m_debuggingLanguagesLabel->setVisible(qmlDebuggingAvailable);
m_debugCppOnlyButton->setVisible(qmlDebuggingAvailable);
m_debugQmlOnlyButton->setVisible(qmlDebuggingAvailable);
m_debugCppAndQmlButton->setVisible(qmlDebuggingAvailable);
}
m_runConfiguration->updateFactoryState();
}
void MaemoRunConfigurationWidget::showDeviceConfigurationsDialog(const QString &link) void MaemoRunConfigurationWidget::showDeviceConfigurationsDialog(const QString &link)
{ {
if (link == QLatin1String("deviceconfig")) { if (link == QLatin1String("deviceconfig")) {
......
...@@ -93,8 +93,6 @@ private slots: ...@@ -93,8 +93,6 @@ private slots:
void handleRemoteMountsChanged(); void handleRemoteMountsChanged();
void handleDebuggingTypeChanged(); void handleDebuggingTypeChanged();
void handleDeploySpecsChanged(); void handleDeploySpecsChanged();
void handleBuildConfigChanged();
void handleToolchainChanged();
void handleActiveDeployConfigurationChanged(); void handleActiveDeployConfigurationChanged();
private: private:
...@@ -124,7 +122,6 @@ private: ...@@ -124,7 +122,6 @@ private:
QComboBox *m_baseEnvironmentComboBox; QComboBox *m_baseEnvironmentComboBox;
MaemoDeviceEnvReader *m_deviceEnvReader; MaemoDeviceEnvReader *m_deviceEnvReader;
ProjectExplorer::EnvironmentWidget *m_environmentWidget; ProjectExplorer::EnvironmentWidget *m_environmentWidget;
Qt4BuildConfiguration *m_lastActiveBuildConfig;
bool m_deployablesConnected; bool m_deployablesConnected;
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment