Merge branch '2.3' into 2.4

Conflicts:
	src/plugins/debugger/commonoptionspage.ui
	src/plugins/madde/maemoqtversion.cpp
	src/plugins/projectexplorer/runsettingspropertiespage.ui

Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf

diff --cc src/app/main.cpp
Simple merge

diff --cc src/plugins/cpptools/cppfilesettingspage.cpp
Simple merge

diff --cc src/plugins/debugger/gdb/gdboptionspage.ui
index 187d228,5627bfb..ce69639
--- 1/src/plugins/debugger/gdb/gdboptionspage.ui
--- 2/src/plugins/debugger/gdb/gdboptionspage.ui
+++ b/src/plugins/debugger/gdb/gdboptionspage.ui
@@@ -146,10 -136,10 +146,10 @@@ on slow machines. In this case, the val
          </property>
         </widget>
        </item>
 -      <item row="9" column="0" colspan="2">
 +      <item row="10" column="0" colspan="2">
         <widget class="QCheckBox" name="checkBoxEnableReverseDebugging">
          <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Selecting this enables reverse debugging.&lt;/p&gt;&lt;.p&gt;&lt;b&gt;Note:&lt;/b&gt;This feature is very slow and unstable on the GDB side. It exhibits unpredictable behaviour when going backwards over system calls and is very likely to destroy your debugging session.&lt;/p&gt;&lt;body&gt;&lt;/html&gt;</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Selecting this enables reverse debugging.&lt;/p&gt;&lt;.p&gt;&lt;b&gt;Note:&lt;/b&gt; This feature is very slow and unstable on the GDB side. It exhibits unpredictable behavior when going backwards over system calls and is very likely to destroy your debugging session.&lt;/p&gt;&lt;body&gt;&lt;/html&gt;</string>
          </property>
          <property name="text">
           <string>Enable reverse debugging</string>

diff --cc src/plugins/madde/maemodeviceconfigwizardreusekeyscheckpage.ui
Simple merge

diff --cc src/plugins/madde/maemopackagecreationwidget.ui
Simple merge

diff --cc src/plugins/madde/maemoqtversion.cpp
index f7b7a34,132c0c7..9bcce33
--- 1/src/plugins/madde/maemoqtversion.cpp
--- 2/src/plugins/remotelinux/maemoqtversion.cpp
+++ b/src/plugins/madde/maemoqtversion.cpp
@@@ -154,12 -153,12 +154,12 @@@ QSet<QString> MaemoQtVersion::supported
  
  QString MaemoQtVersion::description() const
  {
 -    if (m_osType == LinuxDeviceConfiguration::Maemo5OsType)
 +    if (m_osType == QLatin1String(Maemo5OsType))
          return QCoreApplication::translate("QtVersion", "Maemo", "Qt Version is meant for Maemo5");
 -    else if (m_osType == LinuxDeviceConfiguration::HarmattanOsType)
 +    else if (m_osType == QLatin1String(HarmattanOsType))
          return QCoreApplication::translate("QtVersion", "Harmattan ", "Qt Version is meant for Harmattan");
 -    else if (m_osType == LinuxDeviceConfiguration::MeeGoOsType)
 -        return QCoreApplication::translate("QtVersion", "Meego", "Qt Version is meant for MeeGo");
 +    else if (m_osType == QLatin1String(MeeGoOsType))
-         return QCoreApplication::translate("QtVersion", "Meego", "Qt Version is meant for Meego");
++        return QCoreApplication::translate("QtVersion", "MeeGo", "Qt Version is meant for MeeGo");
      return QString();
  }
  

diff --cc src/plugins/madde/qt4maemotarget.cpp
Simple merge

diff --cc src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
Simple merge

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

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

diff --cc src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
Simple merge

diff --cc src/plugins/texteditor/plaintexteditorfactory.cpp
Simple merge