diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-04-08 17:45:39 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-04-09 14:49:32 +0000 |
| commit | 45ba9fcd535e4cfd5f057149b1ca4bb4dfed5bdb (patch) | |
| tree | 3e3246ccf3d971e69004182007bd1b726b88b8bf /src/plugins/projectexplorer/gcctoolchain.cpp | |
| parent | fa517bd72aa21ea82072af27ce98030c4ff028f2 (diff) | |
Output parsers: Replace the chaining approach
Use "flat" aggregation instead.
This is another step towards the formatter/parser merger.
Along the way, also fix some some subclasses (mostly in BareMetal) that
erroneously forwarded handled output to other parsers.
Task-number: QTCREATORBUG-22665
Change-Id: I12947349ca663d2e6bbfc99efd069d69e2b54969
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/gcctoolchain.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/gcctoolchain.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 4b2d04e6e07..cb4f8ce216c 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -731,9 +731,9 @@ FilePath GccToolChain::makeCommand(const Environment &environment) const return tmp.isEmpty() ? FilePath::fromString("make") : tmp; } -IOutputParser *GccToolChain::outputParser() const +QList<IOutputParser *> GccToolChain::outputParsers() const { - return new GccParser; + return GccParser::gccParserSuite(); } void GccToolChain::resetToolChain(const FilePath &path) @@ -1628,9 +1628,9 @@ LanguageExtensions ClangToolChain::defaultLanguageExtensions() const return LanguageExtension::Gnu; } -IOutputParser *ClangToolChain::outputParser() const +QList<IOutputParser *> ClangToolChain::outputParsers() const { - return new ClangParser; + return ClangParser::clangParserSuite(); } // -------------------------------------------------------------------------- @@ -1898,9 +1898,9 @@ LanguageExtensions LinuxIccToolChain::languageExtensions(const QStringList &cxxf return extensions; } -IOutputParser *LinuxIccToolChain::outputParser() const +QList<IOutputParser *> LinuxIccToolChain::outputParsers() const { - return new LinuxIccParser; + return LinuxIccParser::iccParserSuite(); } QStringList LinuxIccToolChain::suggestedMkspecList() const |