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

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.h
This commit is contained in:
hjk
2010-08-12 11:07:08 +02:00
parent 2859065193 e253896b58
commit afcc0f7bf1
5 changed files with 24812 additions and 16334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13656
share/qtcreator/translations/qtcreator_cs.ts
View File

File diff suppressed because it is too large Load Diff

4663
share/qtcreator/translations/qtcreator_ja.ts
View File

File diff suppressed because it is too large Load Diff

22814
share/qtcreator/translations/qtcreator_sl.ts
View File

File diff suppressed because it is too large Load Diff

8
src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp
View File

@@ -101,13 +101,16 @@ MaemoSettingsWidget::MaemoSettingsWidget(QWidget *parent)
: QWidget(parent), : QWidget(parent),
m_ui(new Ui_MaemoSettingsWidget), m_ui(new Ui_MaemoSettingsWidget),
m_devConfs(MaemoDeviceConfigurations::instance().devConfigs()), m_devConfs(MaemoDeviceConfigurations::instance().devConfigs()),
m_nameValidator(new NameValidator(m_devConfs)) m_nameValidator(new NameValidator(m_devConfs)),
m_saveSettingsRequested(false)
{ {
initGui(); initGui();
} }
MaemoSettingsWidget::~MaemoSettingsWidget() MaemoSettingsWidget::~MaemoSettingsWidget()
{ {
if (m_saveSettingsRequested)
MaemoDeviceConfigurations::instance().setDevConfigs(m_devConfs);
} }
QString MaemoSettingsWidget::searchKeywords() const QString MaemoSettingsWidget::searchKeywords() const
@@ -229,7 +232,8 @@ void MaemoSettingsWidget::fillInValues()
void MaemoSettingsWidget::saveSettings() 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() MaemoDeviceConfig &MaemoSettingsWidget::currentConfig()

1
src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.h
View File

@@ -113,6 +113,7 @@ private:
NameValidator * const m_nameValidator; NameValidator * const m_nameValidator;
QSharedPointer<Core::SshConnection> m_connection; QSharedPointer<Core::SshConnection> m_connection;
QSharedPointer<Core::SshRemoteProcess> m_keyDeployer; QSharedPointer<Core::SshRemoteProcess> m_keyDeployer;
bool m_saveSettingsRequested;
}; };
} // namespace Internal } // namespace Internal