Merge remote-tracking branch 'origin/2.3'

Conflicts:
	qtcreator.pri
	qtcreator.pro
	share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
	src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
	src/plugins/remotelinux/remotelinuxruncontrol.cpp

Change-Id: I9c89ba9fa2928e14e148041f9001856dce47a20b

diff --cc doc/qtcreator.qdoc
Simple merge

diff --cc qtcreator.pro
index 12c8f3f,ac7c937..3e15415
--- 1/qtcreator.pro
--- 2/qtcreator.pro
+++ b/qtcreator.pro
@@@ -26,4 -26,4 +26,5 @@@ OTHER_FILES += dist/copyright_template.
      dist/changes-2.1.0 \
      dist/changes-2.2.0 \
      dist/changes-2.3.0 \
 -    dist/changes-2.3.1
++    dist/changes-2.3.1 \
 +    dist/changes-2.4.0

diff --cc share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
index 0f7a2bd,3ef6512..35599af
--- 1/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
--- 2/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
@@@ -55,16 -62,15 +62,13 @@@ QString QmlApplicationViewerPrivate::ad
  #ifdef Q_OS_UNIX
  #ifdef Q_OS_MAC
      if (!QDir::isAbsolutePath(path))
 -        return QCoreApplication::applicationDirPath()
 -                + QLatin1String("/../Resources/") + path;
 +        return QString::fromAscii("%1/../Resources/%2").arg(QCoreApplication::applicationDirPath(),
 +                                                            path);
  #else
 -    QString pathInInstallDir;
 -    const QString applicationDirPath = QCoreApplication::applicationDirPath();
 -    pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path);
 -
 +    const QString pathInInstallDir =
 +            QString::fromAscii("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
-     if (pathInInstallDir.contains(QLatin1String("opt"))
-             && pathInInstallDir.contains(QLatin1String("bin"))
-             && QFileInfo(pathInInstallDir).exists()) {
+     if (QFileInfo(pathInInstallDir).exists())
          return pathInInstallDir;
-     }
  #endif
  #endif
      return path;

diff --cc src/plugins/bineditor/bineditor.cpp
Simple merge

diff --cc src/plugins/debugger/qml/qmlengine.cpp
Simple merge

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

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

diff --cc src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
index 39f7ee0,aa1667f..11ac93e
--- 1/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
--- 2/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
@@@ -365,17 -359,14 +359,14 @@@ void CodaRunControl::handleCreateProces
      const bool ok = result.type == CodaCommandResult::SuccessReply;
      bool processCreated = false;
      if (ok) {
-         if (m_codaFlags & OptionsUseDebugSession) {
-             if (result.values.size()) {
-                 Json::JsonValue id = result.values.at(0).findChild("ID");
-                 if (id.isValid()) {
-                     m_state = StateProcessRunning;
-                     m_runningProcessId = id.data();
-                     processCreated = true;
-                 }
+         if (result.values.size()) {
 -            JsonValue id = result.values.at(0).findChild("ID");
++            Json::JsonValue id = result.values.at(0).findChild("ID");
+             if (id.isValid()) {
+                 m_state = StateProcessRunning;
+                 m_runningProcessId = id.data();
+                 processCreated = true;
              }
-         } else // If no DebugSession is present the process will already be created by now
-             processCreated = true;
+         }
      }
      if (processCreated) {
          setProgress(maxProgress());

diff --cc src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 39833e6,44a840e..96dc194
--- 1/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
--- 2/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@@ -531,16 -531,14 +531,17 @@@ bool Qt4BuildConfiguration::compareToIm
      return false;
  }
  
 -void Qt4BuildConfiguration::removeQMLInspectorFromArguments(QString *args)
 +bool Qt4BuildConfiguration::removeQMLInspectorFromArguments(QString *args)
  {
 +    bool removedArgument = false;
      for (Utils::QtcProcess::ArgIterator ait(args); ait.next(); ) {
-         if (ait.value().contains(QLatin1String(Constants::QMAKEVAR_QMLJSDEBUGGER_PATH))) {
-             ait.deleteArg();
+         const QString arg = ait.value();
+         if (arg.contains(QLatin1String(Constants::QMAKEVAR_QMLJSDEBUGGER_PATH))
 -                || arg.contains(Constants::QMAKEVAR_DECLARATIVE_DEBUG))
 -            ait.deleteArg();
++                || arg.contains(Constants::QMAKEVAR_DECLARATIVE_DEBUG)) {
 +            removedArgument = true;
 +        }
      }
 +    return removedArgument;
  }
  
  QString Qt4BuildConfiguration::extractSpecFromArguments(QString *args,

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

diff --cc src/plugins/qt4projectmanager/wizards/abstractmobileapp.h
Simple merge

diff --cc src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
index 650f6b9,30a09dc..b1c6f12
--- 1/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
--- 2/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
@@@ -233,8 -239,9 +233,9 @@@ QWizard *AbstractMobileAppWizard::creat
      wdlg->m_genericOptionsPage->setOrientation(app()->orientation());
      wdlg->m_symbianOptionsPage->setSvgIcon(app()->symbianSvgIcon());
      wdlg->m_symbianOptionsPage->setNetworkEnabled(app()->networkEnabled());
 -    wdlg->m_maemoOptionsPage->setPngIcon(app()->maemoPngIcon64());
 -    wdlg->m_harmattanOptionsPage->setPngIcon(app()->maemoPngIcon80());
 +    wdlg->m_maemoOptionsPage->setPngIcon(app()->pngIcon64());
 +    wdlg->m_harmattanOptionsPage->setPngIcon(app()->pngIcon80());
+     wdlg->m_harmattanOptionsPage->setBoosterOptionEnabled(app()->canSupportMeegoBooster());
      connect(wdlg, SIGNAL(projectParametersChanged(QString, QString)),
          SLOT(useProjectPath(QString, QString)));
      foreach (QWizardPage *p, extensionPages)
@@@ -251,8 -258,11 +252,11 @@@ Core::GeneratedFiles AbstractMobileAppW
      app()->setSymbianTargetUid(wdlg->m_symbianOptionsPage->symbianUid());
      app()->setSymbianSvgIcon(wdlg->m_symbianOptionsPage->svgIcon());
      app()->setNetworkEnabled(wdlg->m_symbianOptionsPage->networkEnabled());
 -    app()->setMaemoPngIcon64(wdlg->m_maemoOptionsPage->pngIcon());
 -    app()->setMaemoPngIcon80(wdlg->m_harmattanOptionsPage->pngIcon());
 +    app()->setPngIcon64(wdlg->m_maemoOptionsPage->pngIcon());
 +    app()->setPngIcon80(wdlg->m_harmattanOptionsPage->pngIcon());
+     if (wdlg->isHarmattanTargetSelected())
+         app()->setSupportsMeegoBooster(wdlg->isHarmattanTargetSelected()
+                                        && wdlg->m_harmattanOptionsPage->supportsBooster());
      prepareGenerateFiles(wizard, errorMessage);
      return app()->generateFiles(errorMessage);
  }

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

diff --cc src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h
index 87dc8e1,b6e5a38..029108c
--- 1/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h
--- 2/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h
+++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h
@@@ -80,10 -82,10 +80,9 @@@ private
  class MobileAppWizardMaemoOptionsPage : public QWizardPage
  {
      Q_OBJECT
 -    Q_DISABLE_COPY(MobileAppWizardMaemoOptionsPage)
  
  public:
-     explicit MobileAppWizardMaemoOptionsPage(int appIconSize,
-         QWidget *parent = 0);
+     explicit MobileAppWizardMaemoOptionsPage(QWidget *parent = 0);
      virtual ~MobileAppWizardMaemoOptionsPage();
  
      QString pngIcon() const;

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

diff --cc src/plugins/remotelinux/remotelinuxruncontrol.cpp
index f0e4411,aa0abc1..29c5f43
--- 1/src/plugins/remotelinux/remotelinuxruncontrol.cpp
--- 2/src/plugins/remotelinux/remotelinuxruncontrol.cpp
+++ b/src/plugins/remotelinux/remotelinuxruncontrol.cpp
@@@ -37,11 -38,6 +37,9 @@@
  #include <projectexplorer/projectexplorerconstants.h>
  #include <utils/qtcassert.h>
  
- #include <QtGui/QIcon>
- #include <QtGui/QMessageBox>
- 
 +#include <QtCore/QString>
++#include <QtGui/QIcon>
 +
  using namespace ProjectExplorer;
  
  namespace RemoteLinux {