Merge branch '2.2'

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

diff --cc share/qtcreator/gdbmacros/gdbmacros.py
Simple merge

diff --cc src/plugins/debugger/cdb/cdbengine.cpp
index 5c8ee1b,f0217c4..30699e8
--- 1/src/plugins/debugger/cdb/cdbengine.cpp
--- 2/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@@ -1066,8 -1050,8 +1066,9 @@@ unsigned CdbEngine::debuggerCapabilitie
  {
      return DisassemblerCapability | RegisterCapability | ShowMemoryCapability
             |WatchpointCapability|JumpToLineCapability|AddWatcherCapability
+            |ReloadModuleCapability
             |BreakOnThrowAndCatchCapability // Sort-of: Can break on throw().
 +           |BreakConditionCapability|TracePointCapability
             |BreakModuleCapability;
  }
  

diff --cc src/plugins/debugger/debuggerconstants.h
Simple merge

diff --cc src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
Simple merge

diff --cc src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
index 6cb6ce8,b2b0e44..4027cbb
--- 1/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
--- 2/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
@@@ -330,13 -299,12 +334,13 @@@ QStringList MaemoGlobal::targetArgs(con
      return args;
  }
  
 -QString MaemoGlobal::maemoVersionToString(MaemoVersion version)
 +QString MaemoGlobal::osVersionToString(OsVersion version)
  {
      switch (version) {
-     case Maemo5: return QLatin1String("Maemo 5/Fremantle");
-     case Maemo6: return QLatin1String("Maemo 6/Harmattan");
+     case Maemo5: return QLatin1String("Maemo5/Fremantle");
+     case Maemo6: return QLatin1String("Harmattan");
      case Meego: return QLatin1String("Meego");
 +    case GenericLinux: return QLatin1String("Other Linux");
      }
      Q_ASSERT(false);
      return QString();

diff --cc src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
Simple merge

diff --cc src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
Simple merge

diff --cc src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
index 4474d5a,9910380..d9c2ccc
--- 1/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
--- 2/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
@@@ -98,9 -100,10 +98,10 @@@ void MaemoRunControl::handleSshError(co
  
  void MaemoRunControl::startExecution()
  {
 -    appendMessage(tr("Starting remote process ..."), NormalMessageFormat);
 +    appendMessage(tr("Starting remote process ...\n"), NormalMessageFormat);
      m_runner->startExecution(QString::fromLocal8Bit("%1 %2 %3 %4")
-         .arg(MaemoGlobal::remoteCommandPrefix(m_runner->remoteExecutable()))
+         .arg(MaemoGlobal::remoteCommandPrefix(m_runner->devConfig()->osVersion(),
+             m_runner->remoteExecutable()))
          .arg(MaemoGlobal::remoteEnvironment(m_runner->userEnvChanges()))
          .arg(m_runner->remoteExecutable())
          .arg(m_runner->arguments()).toUtf8());

diff --cc src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
Simple merge

diff --cc src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
Simple merge

diff --cc src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
index 2159f5d,e5c6fee..0faf004
--- 1/src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
--- 2/src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
@@@ -117,6 -123,9 +117,7 @@@ private
      virtual bool initAdditionalPackagingSettingsFromOtherTarget()=0;
  
      Qt4BuildConfigurationFactory *m_buildConfigurationFactory;
 -    Qt4MaemoDeployConfigurationFactory *m_deployConfigurationFactory;
 -    MaemoPerTargetDeviceConfigurationListModel * m_deviceConfigurationsListModel;
+     bool m_isInitialized;
  };
  
  

diff --cc src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
Simple merge

diff --cc src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
Simple merge

diff --cc src/plugins/qt4projectmanager/qtversionmanager.cpp
Simple merge