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

Maemo: Don't use "new" MADDE features.

Browse Source 
The MADDE in the SDK is six months old...
This commit is contained in:
Christian Kandeler
2011-04-13 15:09:47 +02:00
parent 3271a83389
commit 433f3d17f5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -632,8 +632,11 @@ void MaemoDeployStep::installToSysroot()
const QString command = QLatin1String( const QString command = QLatin1String(
packagingStep()->debBasedMaemoTarget() ? "xdpkg" : "xrpm"); packagingStep()->debBasedMaemoTarget() ? "xdpkg" : "xrpm");
QStringList args = QStringList() << command << QLatin1String("-i"); 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(); 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()) {