diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp index 70a2d70bf0547356e53cfe721814d71aa890c998..04167a03e30de20e8c086a68438463f9c6e74a16 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp @@ -143,7 +143,6 @@ void S60DeviceRunConfiguration::proFileUpdate(Qt4ProjectManager::Internal::Qt4Pr emit targetInformationChanged(); } - S60DeviceRunConfiguration::~S60DeviceRunConfiguration() { } @@ -288,14 +287,6 @@ QString S60DeviceRunConfiguration::packageTemplateFileName() const return ti.workingDir + QLatin1Char('/') + ti.target + QLatin1String("_template.pkg"); } -QString S60DeviceRunConfiguration::packageFileName() const -{ - QString rc = basePackageFilePath(); - if (!rc.isEmpty()) - rc += QLatin1String(".pkg"); - return rc; -} - /* Grep a package file for the '.exe' file. Curently for use on Linux only * as the '.pkg'-files on Windows do not contain drive letters, which is not * handled here. \code @@ -484,8 +475,6 @@ S60DeviceRunControlBase::S60DeviceRunControlBase(RunConfiguration *runConfigurat m_qtBinPath = qtv->versionInfo().value(QLatin1String("QT_INSTALL_BINS")); QTC_ASSERT(!m_qtBinPath.isEmpty(), return); m_executableFileName = s60runConfig->localExecutableFileName(); - m_packageFilePath = s60runConfig->packageFileName(); - m_packageFile = QFileInfo(m_packageFilePath).fileName(); if (debug) qDebug() << "S60DeviceRunControlBase::CT" << m_targetName << ProjectExplorer::ToolChain::toolChainName(m_toolChain) << m_serialPortName << m_workingDirectory; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h index ead9b621f1ec88f4685bff37743f7b66fc45b6bf..217d9140cc587cee8432acb7b7c3fe6020da8643 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h @@ -83,7 +83,6 @@ public: bool isDebug() const; QString packageTemplateFileName() const; - QString packageFileName() const; QString localExecutableFileName() const; QString signedPackage() const; const QtVersion *qtVersion() const; @@ -190,12 +189,10 @@ private: QString m_targetName; QString m_baseFileName; QStringList m_commandLineArguments; - QString m_packageFilePath; QString m_workingDirectory; QString m_executableFileName; QString m_qtDir; QString m_signedPackage; - QString m_packageFile; QString m_qtBinPath; bool m_releaseDeviceAfterLauncherFinish; bool m_handleDeviceRemoval;