From 488e7ab60856f90307925f6b9bef3666722e4478 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 5 Jul 2012 17:35:11 +0200 Subject: [PATCH] kill dead s60 code Change-Id: Ia532432e2e784ecf433ea2681179b8dbe2a9a682 Reviewed-by: Daniel Teske --- .../qt-s60/s60runcontrolbase.cpp | 15 --------------- .../qt4projectmanager/qt-s60/s60runcontrolbase.h | 4 ---- 2 files changed, 19 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp index 774618bf120..e2884378abb 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp @@ -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; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h index 5b64516402f..48585009c41 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h @@ -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; };