Merge remote branch 'origin/2.0'

Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.h

src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp

@@ -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()

src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.h

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