aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cmakeprojectmanager/cmakebuildstep.h
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2020-05-26 14:34:52 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2020-05-26 13:11:01 +0000
commit301a388982b9a6ce809e507fe660966846e05649 (patch)
tree96b46baa3d8e693521a360a244d18b1da9921cdc /src/plugins/cmakeprojectmanager/cmakebuildstep.h
parent9c3d4dcc8853edb33e1794f78500dfc9c2ea53de (diff)
CMake: Split build output into lines before parsing
This amends commit b15d1951a2, where we moved the line splitting into the output parsers, but overlooked that the CMakeBuildStep does additional line-based parsing. As a result, the stdout -> stderr redirection for ninja output was broken. Change-Id: Iafbbce9a3f9c0383812a9e4c129c1d94fa907b73 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakebuildstep.h')
-rw-r--r--src/plugins/cmakeprojectmanager/cmakebuildstep.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.h b/src/plugins/cmakeprojectmanager/cmakebuildstep.h
index 1e5a4e7100..f2a650fe78 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.h
@@ -77,7 +77,7 @@ protected:
bool fromMap(const QVariantMap &map) override;
// For parsing [ 76%]
- void stdOutput(const QString &line) override;
+ void stdOutput(const QString &output) override;
private:
void ctor(ProjectExplorer::BuildStepList *bsl);