Commit 4abf51d1 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

ToolChain: Remove useless virtual method



Change-Id: Ifbc2713fc100570f7dd245cd9b00c4a6b8decb83
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 72ad38ac
......@@ -177,9 +177,8 @@ QString MaemoToolChain::legacyId() const
.arg(debuggerCommand().toString());
}
QList<ProjectExplorer::Abi> MaemoToolChain::findAbiForCompilerPath(const QString &path)
QList<ProjectExplorer::Abi> MaemoToolChain::detectSupportedAbis() const
{
Q_UNUSED(path);
if (m_qtVersionId < 0)
return QList<ProjectExplorer::Abi>();
......
......@@ -70,7 +70,7 @@ public:
QString legacyId() const;
protected:
QList<ProjectExplorer::Abi> findAbiForCompilerPath(const QString &path);
QList<ProjectExplorer::Abi> detectSupportedAbis() const;
private:
explicit MaemoToolChain(bool);
......
......@@ -267,6 +267,9 @@ static QList<ProjectExplorer::Abi> guessGccAbi(const QString &m)
static QList<ProjectExplorer::Abi> guessGccAbi(const Utils::FileName &path, const QStringList &env)
{
if (path.isEmpty())
return QList<ProjectExplorer::Abi>();
QStringList arguments(QLatin1String("-dumpmachine"));
QString machine = QString::fromLocal8Bit(runGcc(path, arguments, env)).trimmed();
return guessGccAbi(machine);
......@@ -310,14 +313,6 @@ QString GccToolChain::defaultDisplayName() const
ProjectExplorer::Abi::toString(m_targetAbi.wordWidth()));
}
QList<Abi> GccToolChain::findAbiForCompilerPath(const QString &path)
{
if (path.isEmpty())
return QList<Abi>();
return detectSupportedAbis();
}
QString GccToolChain::legacyId() const
{
QString i = id();
......@@ -466,7 +461,7 @@ void GccToolChain::setCompilerCommand(const Utils::FileName &path)
m_compilerCommand = path;
Abi currentAbi = m_targetAbi;
m_supportedAbis = findAbiForCompilerPath(m_compilerCommand.toString());
m_supportedAbis = detectSupportedAbis();
m_targetAbi = Abi();
if (!m_supportedAbis.isEmpty()) {
......
......@@ -91,7 +91,6 @@ protected:
GccToolChain(const GccToolChain &);
virtual QString defaultDisplayName() const;
virtual QList<Abi> findAbiForCompilerPath(const QString &path);
virtual QList<Abi> detectSupportedAbis() const;
virtual QString detectVersion() const;
......
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