diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-10-28 10:17:44 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-10-28 10:17:44 +0200 |
| commit | 81cce8902ee0383c57d90792e5dd52fe5d7f0b84 (patch) | |
| tree | 0ff6facd20b82a61803b1f8d22d3576aa0016469 /src/plugins/madde/maemoinstalltosysrootstep.cpp | |
| parent | 2ee0b36342446dd8816480d849138496321b154a (diff) | |
| parent | 5dcf7d2ef03827329e2d57ac33ac391abf278d57 (diff) | |
| download | qt-creator-81cce8902ee0383c57d90792e5dd52fe5d7f0b84.tar.gz | |
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
Diffstat (limited to 'src/plugins/madde/maemoinstalltosysrootstep.cpp')
| -rw-r--r-- | src/plugins/madde/maemoinstalltosysrootstep.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
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 |