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

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