summaryrefslogtreecommitdiff
path: root/src/plugins/qt4projectmanager/qt-maemo
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@nokia.com>2011-04-13 15:09:47 +0200
committerChristian Kandeler <christian.kandeler@nokia.com>2011-04-13 15:27:17 +0200
commit433f3d17f531878d62fb45680913e2e6059fa9b5 (patch)
tree6253a94974857ec599b116087026ac6c01fc4adf /src/plugins/qt4projectmanager/qt-maemo
parent3271a833898add4052118161a94b842451cd97fc (diff)
downloadqt-creator-433f3d17f531878d62fb45680913e2e6059fa9b5.tar.gz
Maemo: Don't use "new" MADDE features.
The MADDE in the SDK is six months old...
Diffstat (limited to 'src/plugins/qt4projectmanager/qt-maemo')
-rw-r--r--src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
index bfac6d9eb9..5c93bd5dca 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
@@ -632,8 +632,11 @@ void MaemoDeployStep::installToSysroot()
const QString command = QLatin1String(
packagingStep()->debBasedMaemoTarget() ? "xdpkg" : "xrpm");
QStringList args = QStringList() << command << QLatin1String("-i");
- if (packagingStep()->debBasedMaemoTarget())
- args << QLatin1String("--no-force-downgrade");
+
+ // Cannot use it, because we have an outdated MADDE version in the SDK.
+// if (packagingStep()->debBasedMaemoTarget())
+// args << QLatin1String("--no-force-downgrade");
+
args << packagingStep()->packageFilePath();
MaemoGlobal::callMadAdmin(*m_sysrootInstaller, args, qtVersion, true);
if (!m_sysrootInstaller->waitForStarted()) {