From 1c1ebe40a07653d5f3730a95ab4460244b329840 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 8 Feb 2011 10:45:07 +0100 Subject: [PATCH] Maemo: Use xdpkg's new --no-force-downgrade option. --- src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp index 7675a5ef688..85fd679ae80 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp @@ -613,8 +613,10 @@ void MaemoDeployStep::installToSysroot() const QtVersion * const qtVersion = bc->qtVersion(); const QString command = QLatin1String( packagingStep()->debBasedMaemoTarget() ? "xdpkg" : "xrpm"); - const QStringList args = QStringList() << command - << QLatin1String("-i") << packagingStep()->packageFilePath(); + QStringList args = QStringList() << command << QLatin1String("-i"); + if (packagingStep()->debBasedMaemoTarget()) + args << QLatin1String("--no-force-downgrade"); + args << packagingStep()->packageFilePath(); MaemoGlobal::callMadAdmin(*m_sysrootInstaller, args, qtVersion, true); if (!m_sysrootInstaller->waitForStarted()) { writeOutput(tr("Installation to sysroot failed, continuing anyway."),