feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fremantle: Don't use unsupported "mad" option.

Browse Source 
Our SDK uses an outdated MADDE that does not support
the "--no-force-downgrade" option when deploying into the sysroot.

Task-number: QTCREATORBUG-6328

Change-Id: Icb0c9774daee9b9840403ca8a14c9f6604cf3624
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2011-10-24 17:29:58 +02:00
parent e7bba25446
commit 5a38e9b9cc
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/madde/maemoinstalltosysrootstep.cpp
View File

@@ -35,6 +35,7 @@
#include "maemoglobal.h" #include "maemoglobal.h"
#include "maemopackagecreationstep.h" #include "maemopackagecreationstep.h"
#include "maemoqtversion.h" #include "maemoqtversion.h"
#include "qt4maemotarget.h"
#include <utils/fileutils.h> #include <utils/fileutils.h>
@@ -248,8 +249,12 @@ BuildStepConfigWidget *MaemoInstallDebianPackageToSysrootStep::createConfigWidge
QStringList MaemoInstallDebianPackageToSysrootStep::madArguments() const QStringList MaemoInstallDebianPackageToSysrootStep::madArguments() const
{ {
return QStringList() << QLatin1String("xdpkg") << QLatin1String("--no-force-downgrade") QStringList args;
<< QLatin1String("-i"); args << QLatin1String("xdpkg");
if (qobject_cast<Qt4HarmattanTarget *>(target()))
args << QLatin1String("--no-force-downgrade");
args << QLatin1String("-i");
return args;
} }
const QString MaemoInstallDebianPackageToSysrootStep::Id const QString MaemoInstallDebianPackageToSysrootStep::Id