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

Maemo: Remove redundant code for adding "-t <target>" to mad command.

Browse Source
This commit is contained in:
Christian Kandeler
2011-02-01 10:18:16 +01:00
parent 14cb9f91ad
commit eeedd340a8
6 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -613,10 +613,9 @@ void MaemoDeployStep::installToSysroot()
const Qt4BuildConfiguration * const bc
= static_cast<Qt4BuildConfiguration *>(buildConfiguration());
const QtVersion * const qtVersion = bc->qtVersion();
const QStringList args = QStringList() << QLatin1String("-t")
<< MaemoGlobal::targetName(qtVersion) << QLatin1String("xdpkg")
const QStringList args = QStringList() << QLatin1String("xdpkg")
<< QLatin1String("-i") << packagingStep()->packageFilePath();
MaemoGlobal::callMadAdmin(*m_sysrootInstaller, args, qtVersion);
MaemoGlobal::callMadAdmin(*m_sysrootInstaller, args, qtVersion, true);
if (!m_sysrootInstaller->waitForStarted()) {
writeOutput(tr("Installation to sysroot failed, continuing anyway."),
ErrorMessageOutput);