diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-03-01 15:18:40 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-03-12 08:50:45 +0000 |
| commit | 0978901b73f8061b709af06953bc8a9cac77f74e (patch) | |
| tree | 059c65f4e548f4617fdc463f30b3c6b636c93032 /src/plugins/projectexplorer/applicationlauncher.cpp | |
| parent | 6eb233ad12638378427887fd0eb0512c2a427498 (diff) | |
ProjectExplorer: Introduce dedicated output settings pages
One page for application output, one for build output. The respective
settings are now easier to find, and the general Build & Run settings
page looks more tidy now. We will also be able to link directly to the
respective settings from some button in the output panes in the future.
As a side effect, this patch also introduces a dedicated "word-wrap
output" setting for the compile output pane. It used to share this
setting with the application output pane, which was not obvious and
might not be what the user wants.
Change-Id: I5629363863ffe38e0faa006d361ec21484b593f4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/applicationlauncher.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/applicationlauncher.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/applicationlauncher.cpp b/src/plugins/projectexplorer/applicationlauncher.cpp index 79f093d098..c0defc548b 100644 --- a/src/plugins/projectexplorer/applicationlauncher.cpp +++ b/src/plugins/projectexplorer/applicationlauncher.cpp @@ -126,7 +126,7 @@ public: ApplicationLauncherPrivate::ApplicationLauncherPrivate(ApplicationLauncher *parent) : q(parent), m_outputCodec(QTextCodec::codecForLocale()) { - if (ProjectExplorerPlugin::projectExplorerSettings().mergeStdErrAndStdOut){ + if (ProjectExplorerPlugin::appOutputSettings().mergeChannels) { m_guiProcess.setProcessChannelMode(QProcess::MergedChannels); } else { m_guiProcess.setProcessChannelMode(QProcess::SeparateChannels); |