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

ProjectExplorer: Fix compile for gcc4.9

Browse Source 
Broke with b9278a88d0.

Change-Id: Ic1de9530bd680a9951b64a298736f6c41de2f5f9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Stenger
2018-04-20 12:55:44 +02:00
parent bd836a8d24
commit 92f30a6890
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/toolchainsettingsaccessor.cpp
View File

@@ -304,7 +304,7 @@ public:
static QList<TTC *> toolChains(); static QList<TTC *> toolChains();
static bool hasToolChains() { return !m_toolChains.isEmpty(); } static bool hasToolChains() { return !m_toolChains.isEmpty(); }
QString typeDisplayName() const override { return "Test Tool Chain"; } QString typeDisplayName() const override { return QString("Test Tool Chain"); }
Abi targetAbi() const override { return Abi::hostAbi(); } Abi targetAbi() const override { return Abi::hostAbi(); }
bool isValid() const override { return m_valid; } bool isValid() const override { return m_valid; }
PredefinedMacrosRunner createPredefinedMacrosRunner() const override { return PredefinedMacrosRunner(); } PredefinedMacrosRunner createPredefinedMacrosRunner() const override { return PredefinedMacrosRunner(); }
@@ -315,7 +315,7 @@ public:
QList<HeaderPath> systemHeaderPaths(const QStringList &cxxflags, const FileName &sysRoot) const override QList<HeaderPath> systemHeaderPaths(const QStringList &cxxflags, const FileName &sysRoot) const override
{ Q_UNUSED(cxxflags); Q_UNUSED(sysRoot); return QList<HeaderPath>(); } { Q_UNUSED(cxxflags); Q_UNUSED(sysRoot); return QList<HeaderPath>(); }
void addToEnvironment(Environment &env) const override { Q_UNUSED(env); } void addToEnvironment(Environment &env) const override { Q_UNUSED(env); }
QString makeCommand(const Environment &env) const override { Q_UNUSED(env); return "make"; } QString makeCommand(const Environment &env) const override { Q_UNUSED(env); return QString("make"); }
FileName compilerCommand() const override { return Utils::FileName::fromString("/tmp/test/gcc"); } FileName compilerCommand() const override { return Utils::FileName::fromString("/tmp/test/gcc"); }
IOutputParser *outputParser() const override { return nullptr; } IOutputParser *outputParser() const override { return nullptr; }
ToolChainConfigWidget *configurationWidget() override { return nullptr; } ToolChainConfigWidget *configurationWidget() override { return nullptr; }