From b17bb91355a428ecd89504ba7968e272e854ceb5 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 29 Oct 2013 12:05:44 +0100 Subject: [PATCH] GccToolchain: Move reinterpretOptions into the header Considering that this is a Noop by default we want that inlined. Change-Id: Iefd822ad9e5fc576fb538d9b891f6e3ed3b914aa Reviewed-by: Daniel Teske --- src/plugins/projectexplorer/gcctoolchain.cpp | 6 ------ src/plugins/projectexplorer/gcctoolchain.h | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 957837ec37e..48a05ed2711 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -734,12 +734,6 @@ QString GccToolChain::detectVersion() const return gccVersion(m_compilerCommand, env.toStringList()); } -QStringList GccToolChain::reinterpretOptions(const QStringList &arg) const -{ - // Nothing todo - return arg; -} - // -------------------------------------------------------------------------- // GccToolChainFactory // -------------------------------------------------------------------------- diff --git a/src/plugins/projectexplorer/gcctoolchain.h b/src/plugins/projectexplorer/gcctoolchain.h index a4f79dd01b4..2bcf3f00020 100644 --- a/src/plugins/projectexplorer/gcctoolchain.h +++ b/src/plugins/projectexplorer/gcctoolchain.h @@ -111,7 +111,7 @@ protected: // Reinterpret options for compiler drivers inheriting from GccToolChain (e.g qcc) to apply -Wp option // that passes the initial options directly down to the gcc compiler - virtual QStringList reinterpretOptions(const QStringList &argument) const; + virtual QStringList reinterpretOptions(const QStringList &argument) const { return argument; } static QList gccHeaderPaths(const Utils::FileName &gcc, const QStringList &args, const QStringList &env); static const int PREDEFINED_MACROS_CACHE_SIZE;