Commit 3f31c5ba authored by con's avatar con
Browse files

Remove some unused code.

parent 4b185ee2
...@@ -143,7 +143,6 @@ void S60DeviceRunConfiguration::proFileUpdate(Qt4ProjectManager::Internal::Qt4Pr ...@@ -143,7 +143,6 @@ void S60DeviceRunConfiguration::proFileUpdate(Qt4ProjectManager::Internal::Qt4Pr
emit targetInformationChanged(); emit targetInformationChanged();
} }
S60DeviceRunConfiguration::~S60DeviceRunConfiguration() S60DeviceRunConfiguration::~S60DeviceRunConfiguration()
{ {
} }
...@@ -288,14 +287,6 @@ QString S60DeviceRunConfiguration::packageTemplateFileName() const ...@@ -288,14 +287,6 @@ QString S60DeviceRunConfiguration::packageTemplateFileName() const
return ti.workingDir + QLatin1Char('/') + ti.target + QLatin1String("_template.pkg"); 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 /* 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 * as the '.pkg'-files on Windows do not contain drive letters, which is not
* handled here. \code * handled here. \code
...@@ -484,8 +475,6 @@ S60DeviceRunControlBase::S60DeviceRunControlBase(RunConfiguration *runConfigurat ...@@ -484,8 +475,6 @@ S60DeviceRunControlBase::S60DeviceRunControlBase(RunConfiguration *runConfigurat
m_qtBinPath = qtv->versionInfo().value(QLatin1String("QT_INSTALL_BINS")); m_qtBinPath = qtv->versionInfo().value(QLatin1String("QT_INSTALL_BINS"));
QTC_ASSERT(!m_qtBinPath.isEmpty(), return); QTC_ASSERT(!m_qtBinPath.isEmpty(), return);
m_executableFileName = s60runConfig->localExecutableFileName(); m_executableFileName = s60runConfig->localExecutableFileName();
m_packageFilePath = s60runConfig->packageFileName();
m_packageFile = QFileInfo(m_packageFilePath).fileName();
if (debug) if (debug)
qDebug() << "S60DeviceRunControlBase::CT" << m_targetName << ProjectExplorer::ToolChain::toolChainName(m_toolChain) qDebug() << "S60DeviceRunControlBase::CT" << m_targetName << ProjectExplorer::ToolChain::toolChainName(m_toolChain)
<< m_serialPortName << m_workingDirectory; << m_serialPortName << m_workingDirectory;
......
...@@ -83,7 +83,6 @@ public: ...@@ -83,7 +83,6 @@ public:
bool isDebug() const; bool isDebug() const;
QString packageTemplateFileName() const; QString packageTemplateFileName() const;
QString packageFileName() const;
QString localExecutableFileName() const; QString localExecutableFileName() const;
QString signedPackage() const; QString signedPackage() const;
const QtVersion *qtVersion() const; const QtVersion *qtVersion() const;
...@@ -190,12 +189,10 @@ private: ...@@ -190,12 +189,10 @@ private:
QString m_targetName; QString m_targetName;
QString m_baseFileName; QString m_baseFileName;
QStringList m_commandLineArguments; QStringList m_commandLineArguments;
QString m_packageFilePath;
QString m_workingDirectory; QString m_workingDirectory;
QString m_executableFileName; QString m_executableFileName;
QString m_qtDir; QString m_qtDir;
QString m_signedPackage; QString m_signedPackage;
QString m_packageFile;
QString m_qtBinPath; QString m_qtBinPath;
bool m_releaseDeviceAfterLauncherFinish; bool m_releaseDeviceAfterLauncherFinish;
bool m_handleDeviceRemoval; bool m_handleDeviceRemoval;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment