Merge remote-tracking branch 'origin/2.4'

Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljscheck.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac

6 files changed, 56 insertions, 9 deletions

diff --git a/src/plugins/madde/maemodeviceconfigwizardreusekeyscheckpage.ui b/src/plugins/madde/maemodeviceconfigwizardreusekeyscheckpage.ui
index 8332f17a75..0f4c5bf987 100644
--- a/src/plugins/madde/maemodeviceconfigwizardreusekeyscheckpage.ui
+++ b/src/plugins/madde/maemodeviceconfigwizardreusekeyscheckpage.ui
@@ -17,7 +17,7 @@
    <item>
     <widget class="QLabel" name="questionLabel">
      <property name="text">
-      <string>Do wou want to re-use an existing pair of keys or should a new one be created?</string>
+      <string>Do you want to re-use an existing pair of keys or should a new one be created?</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
diff --git a/src/plugins/madde/maemoinstalltosysrootstep.cpp b/src/plugins/madde/maemoinstalltosysrootstep.cpp
index 84ad25d2b6..2a1ea14dba 100644
--- a/src/plugins/madde/maemoinstalltosysrootstep.cpp
+++ b/src/plugins/madde/maemoinstalltosysrootstep.cpp
@@ -35,6 +35,7 @@
 #include "maemoglobal.h"
 #include "maemopackagecreationstep.h"
 #include "maemoqtversion.h"
+#include "qt4maemotarget.h"
 
 #include <utils/fileutils.h>
 
@@ -247,8 +248,12 @@ BuildStepConfigWidget *MaemoInstallDebianPackageToSysrootStep::createConfigWidge
 
 QStringList MaemoInstallDebianPackageToSysrootStep::madArguments() const
 {
-    return QStringList() << QLatin1String("xdpkg") << QLatin1String("--no-force-downgrade")
-        << QLatin1String("-i");
+    QStringList args;
+    args << QLatin1String("xdpkg");
+    if (qobject_cast<Qt4HarmattanTarget *>(target()))
+        args << QLatin1String("--no-force-downgrade");
+    args << QLatin1String("-i");
+    return args;
 }
 
 const QString MaemoInstallDebianPackageToSysrootStep::Id
diff --git a/src/plugins/madde/maemopackagecreationwidget.ui b/src/plugins/madde/maemopackagecreationwidget.ui
index b7017f2727..cdadad9388 100644
--- a/src/plugins/madde/maemopackagecreationwidget.ui
+++ b/src/plugins/madde/maemopackagecreationwidget.ui
@@ -229,7 +229,7 @@
        <item>
         <widget class="QPushButton" name="editDebianFileButton">
          <property name="text">
-          <string>Edit</string>
+          <string>Edit...</string>
          </property>
         </widget>
        </item>
diff --git a/src/plugins/madde/maemoqtversion.cpp b/src/plugins/madde/maemoqtversion.cpp
index f7b7a34116..9bcce33d05 100644
--- a/src/plugins/madde/maemoqtversion.cpp
+++ b/src/plugins/madde/maemoqtversion.cpp
@@ -159,7 +159,7 @@ QString MaemoQtVersion::description() const
     else if (m_osType == QLatin1String(HarmattanOsType))
         return QCoreApplication::translate("QtVersion", "Harmattan ", "Qt Version is meant for Harmattan");
     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 --git a/src/plugins/madde/qt4maemotarget.cpp b/src/plugins/madde/qt4maemotarget.cpp
index 1ebd602595..afe2828777 100644
--- a/src/plugins/madde/qt4maemotarget.cpp
+++ b/src/plugins/madde/qt4maemotarget.cpp
@@ -50,9 +50,10 @@
 #include <qt4projectmanager/qt4project.h>
 #include <qt4projectmanager/qt4buildconfiguration.h>
 #include <qt4projectmanager/qt4nodes.h>
+#include <qtsupport/baseqtversion.h>
 #include <utils/fileutils.h>
 #include <utils/filesystemwatcher.h>
-#include <qtsupport/baseqtversion.h>
+#include <utils/qtcassert.h>
 
 #include <QtGui/QApplication>
 #include <QtGui/QMainWindow>
@@ -446,8 +447,11 @@ bool AbstractDebBasedQt4MaemoTarget::setProjectVersionInternal(const QString &ve
     }
     const int utcOffsetMinutes = (utcOffsetSeconds / 60) % 60;
     const int utcOffsetHours = utcOffsetSeconds / 3600;
-    const QString dateString = QString::fromLatin1("%1 %2%3%4")
-        .arg(currentDateTime.toString(QLatin1String("ddd, dd MMM yyyy hh:mm:ss"))).arg(sign)
+    const QString dateString = QString::fromLatin1("%1, %2 %3 %4 %5%6%7")
+        .arg(shortDayOfWeekName(currentDateTime))
+        .arg(currentDateTime.toString(QLatin1String("dd")))
+        .arg(shortMonthName(currentDateTime))
+        .arg(currentDateTime.toString(QLatin1String("yyyy hh:mm:ss"))).arg(sign)
         .arg(utcOffsetHours, 2, 10, QLatin1Char('0'))
         .arg(utcOffsetMinutes, 2, 10, QLatin1Char('0'));
     const QString maintainerLine = content.mid(maintainerOffset, eolOffset - maintainerOffset + 1)
@@ -917,6 +921,41 @@ bool AbstractDebBasedQt4MaemoTarget::setPackageManagerIcon(const QString &iconFi
     return success;
 }
 
+// The QDateTime API can only deliver these in localized form...
+QString AbstractDebBasedQt4MaemoTarget::shortMonthName(const QDateTime &dt) const
+{
+    switch (dt.date().month()) {
+    case 1: return QLatin1String("Jan");
+    case 2: return QLatin1String("Feb");
+    case 3: return QLatin1String("Mar");
+    case 4: return QLatin1String("Apr");
+    case 5: return QLatin1String("May");
+    case 6: return QLatin1String("Jun");
+    case 7: return QLatin1String("Jul");
+    case 8: return QLatin1String("Aug");
+    case 9: return QLatin1String("Sep");
+    case 10: return QLatin1String("Oct");
+    case 11: return QLatin1String("Nov");
+    case 12: return QLatin1String("Dec");
+    default: QTC_ASSERT(false, return QString());
+    }
+}
+
+QString AbstractDebBasedQt4MaemoTarget::shortDayOfWeekName(const QDateTime &dt) const
+{
+    switch (dt.date().dayOfWeek()) {
+    case Qt::Monday: return QLatin1String("Mon");
+    case Qt::Tuesday: return QLatin1String("Tue");
+    case Qt::Wednesday: return QLatin1String("Wed");
+    case Qt::Thursday: return QLatin1String("Thu");
+    case Qt::Friday: return QLatin1String("Fri");
+    case Qt::Saturday: return QLatin1String("Sat");
+    case Qt::Sunday: return QLatin1String("Sun");
+    default: QTC_ASSERT(false, return QString());
+    }
+}
+
+
 AbstractRpmBasedQt4MaemoTarget::AbstractRpmBasedQt4MaemoTarget(Qt4Project *parent,
     const QString &id) : AbstractQt4MaemoTarget(parent, id)
 {
@@ -1200,7 +1239,7 @@ Qt4MeegoTarget::~Qt4MeegoTarget() {}
 QString Qt4MeegoTarget::defaultDisplayName()
 {
     return QApplication::translate("Qt4ProjectManager::Qt4Target",
-        "Meego", "Qt4 Meego target display name");
+        "MeeGo", "Qt4 MeeGo target display name");
 }
 
 QString Qt4MeegoTarget::specFileName() const
diff --git a/src/plugins/madde/qt4maemotarget.h b/src/plugins/madde/qt4maemotarget.h
index 822678f140..d473c4441a 100644
--- a/src/plugins/madde/qt4maemotarget.h
+++ b/src/plugins/madde/qt4maemotarget.h
@@ -39,6 +39,7 @@
 #include <QtCore/QSharedPointer>
 #include <QtGui/QIcon>
 
+QT_FORWARD_DECLARE_CLASS(QDateTime)
 QT_FORWARD_DECLARE_CLASS(QFile)
 
 namespace Qt4ProjectManager {
@@ -178,6 +179,8 @@ private:
         QString *error = 0);
     QString defaultPackageFileName() const;
     bool setPackageManagerNameInternal(const QString &name, QString *error = 0);
+    QString shortMonthName(const QDateTime &dt) const;
+    QString shortDayOfWeekName(const QDateTime &dt) const;
 
     WatchableFile *m_controlFile;
     WatchableFile *m_changeLogFile;