Merge remote branch 'origin/2.1'

Conflicts: doc/qtcreator.qdoc share/qtcreator/templates/mobileapp/app.pro
2010-10-25 11:27:30 +02:00
parent 3b2614c697 49bb852292
commit 35bb61590d
83 changed files with 83178 additions and 77579 deletions
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp
@@ -111,6 +111,7 @@ MaemoSettingsWidget::~MaemoSettingsWidget()
 {
    if (m_saveSettingsRequested)
        MaemoDeviceConfigurations::instance().setDevConfigs(m_devConfs);
+    delete m_ui;
 }

 QString MaemoSettingsWidget::searchKeywords() const