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

Maemo: Use xdpkg's new --no-force-downgrade option.

Browse Source
This commit is contained in:
Christian Kandeler
2011-02-08 10:45:07 +01:00
parent 3061a162d2
commit 1c1ebe40a0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
View File

@@ -613,8 +613,10 @@ void MaemoDeployStep::installToSysroot()
const QtVersion * const qtVersion = bc->qtVersion(); const QtVersion * const qtVersion = bc->qtVersion();
const QString command = QLatin1String( const QString command = QLatin1String(
packagingStep()->debBasedMaemoTarget() ? "xdpkg" : "xrpm"); packagingStep()->debBasedMaemoTarget() ? "xdpkg" : "xrpm");
const QStringList args = QStringList() << command QStringList args = QStringList() << command << QLatin1String("-i");
<< QLatin1String("-i") << packagingStep()->packageFilePath(); if (packagingStep()->debBasedMaemoTarget())
args << QLatin1String("--no-force-downgrade");
args << packagingStep()->packageFilePath();
MaemoGlobal::callMadAdmin(*m_sysrootInstaller, args, qtVersion, true); MaemoGlobal::callMadAdmin(*m_sysrootInstaller, args, qtVersion, true);
if (!m_sysrootInstaller->waitForStarted()) { if (!m_sysrootInstaller->waitForStarted()) {
writeOutput(tr("Installation to sysroot failed, continuing anyway."), writeOutput(tr("Installation to sysroot failed, continuing anyway."),