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

kill dead s60 code

Browse Source 
Change-Id: Ia532432e2e784ecf433ea2681179b8dbe2a9a682
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-07-05 17:35:11 +02:00
parent 0a348dd8e2
commit 488e7ab608
2 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp
View File

@@ -93,12 +93,7 @@ S60RunControlBase::S60RunControlBase(RunConfiguration *runConfiguration,
m_commandLineArguments.prepend(QLatin1Char(' '));
m_commandLineArguments.prepend(qmlArgs);
}
if (const QtSupport::BaseQtVersion *qtv = QtSupport::QtProfileInformation::qtVersion(runConfiguration->target()->profile())) {
m_qtDir = qtv->versionInfo().value(QLatin1String("QT_INSTALL_DATA"));
m_qtBinPath = qtv->versionInfo().value(QLatin1String("QT_INSTALL_BINS"));
}
m_installationDrive = activeDeployConf->installationDrive();
QTC_ASSERT(!m_qtBinPath.isEmpty(), return);
m_executableFileName = s60runConfig->localExecutableFileName();
m_runSmartInstaller = activeDeployConf->runSmartInstaller();
@@ -238,16 +233,6 @@ const QString &S60RunControlBase::executableFileName() const
return m_executableFileName;
}
const QString &S60RunControlBase::qtDir() const
{
return m_qtDir;
}
const QString &S60RunControlBase::qtBinPath() const
{
return m_qtBinPath;
}
bool S60RunControlBase::runSmartInstaller() const
{
return m_runSmartInstaller;

4
src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h
View File

@@ -66,8 +66,6 @@ protected:
const QString &targetName() const;
const QString &commandLineArguments() const;
const QString &executableFileName() const;
const QString &qtDir() const;
const QString &qtBinPath() const;
bool runSmartInstaller() const;
char installationDrive() const;
@@ -91,8 +89,6 @@ private:
QString m_targetName;
QString m_commandLineArguments;
QString m_executableFileName;
QString m_qtDir;
QString m_qtBinPath;
bool m_runSmartInstaller;
char m_installationDrive;
};