Commit afcc0f7b authored by hjk's avatar hjk

Merge remote branch 'origin/2.0'

Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.h
parents 28590651 e253896b
......@@ -101,13 +101,16 @@ MaemoSettingsWidget::MaemoSettingsWidget(QWidget *parent)
: QWidget(parent),
m_ui(new Ui_MaemoSettingsWidget),
m_devConfs(MaemoDeviceConfigurations::instance().devConfigs()),
m_nameValidator(new NameValidator(m_devConfs))
m_nameValidator(new NameValidator(m_devConfs)),
m_saveSettingsRequested(false)
{
initGui();
}
MaemoSettingsWidget::~MaemoSettingsWidget()
{
if (m_saveSettingsRequested)
MaemoDeviceConfigurations::instance().setDevConfigs(m_devConfs);
}
QString MaemoSettingsWidget::searchKeywords() const
......@@ -229,7 +232,8 @@ void MaemoSettingsWidget::fillInValues()
void MaemoSettingsWidget::saveSettings()
{
MaemoDeviceConfigurations::instance().setDevConfigs(m_devConfs);
// We must defer this step because of a stupid bug on MacOS. See QTCREATORBUG-1675.
m_saveSettingsRequested = true;
}
MaemoDeviceConfig &MaemoSettingsWidget::currentConfig()
......
......@@ -113,6 +113,7 @@ private:
NameValidator * const m_nameValidator;
QSharedPointer<Core::SshConnection> m_connection;
QSharedPointer<Core::SshRemoteProcess> m_keyDeployer;
bool m_saveSettingsRequested;
};
} // namespace Internal
......
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