diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp index 358915b85b302471a3be89d88b95c07517afd3f0..19eed45c7980afb7935537b322c40b79a08fc98b 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp @@ -219,16 +219,6 @@ MaemoDeviceConfig MaemoDeployStep::deviceConfig() const : MaemoDeviceConfig(); } -QString MaemoDeployStep::packageFileName() const -{ - return QFileInfo(packageFilePath()).fileName(); -} - -QString MaemoDeployStep::packageFilePath() const -{ - return packagingStep()->packageFilePath(); -} - void MaemoDeployStep::start() { m_stopped = false; @@ -288,7 +278,7 @@ void MaemoDeployStep::handleSftpChannelInitialized() const MaemoPackageCreationStep * const pStep = packagingStep(); const QString hostName = m_connection->connectionParameters().host; if (pStep->isPackagingEnabled()) { - const MaemoDeployable d(packageFilePath(), uploadDir()); + const MaemoDeployable d(pStep->packageFilePath(), uploadDir()); if (currentlyNeedsDeployment(hostName, d)) { if (!deploy(MaemoDeployable(d))) return; @@ -405,8 +395,10 @@ void MaemoDeployStep::handleLinkProcessFinished(int exitStatus) if (m_linksInProgress.isEmpty() && m_uploadsInProgress.isEmpty()) { if (m_needsInstall) { writeOutput(tr("Installing package ...")); + const QString packageFileName + = QFileInfo(packagingStep()->packageFilePath()).fileName(); const QByteArray cmd = remoteSudo().toUtf8() + " dpkg -i " - + packageFileName().toUtf8(); + + packageFileName.toUtf8(); m_installer = m_connection->createRemoteProcess(cmd); connect(m_installer.data(), SIGNAL(closed(int)), this, SLOT(handleInstallationFinished(int))); diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.h b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.h index b939997a7fc70879f8cbc5c54af06d80af885fe3..95331c1cd96dadbb34548000a49575908c21c49e 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.h +++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.h @@ -104,8 +104,6 @@ private: const MaemoPackageCreationStep *packagingStep() const; bool deploy(const MaemoDeployable &deployable); QString uploadDir() const; - QString packageFileName() const; - QString packageFilePath() const; static const QLatin1String Id;