summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer/projectexplorersettingspage.ui
diff options
context:
space:
mode:
authorFawzi Mohamed <fawzi.mohamed@nokia.com>2011-05-17 15:14:43 +0200
committerFawzi Mohamed <fawzi.mohamed@nokia.com>2011-05-17 15:18:08 +0200
commitdb2dd3e277382cf9238904de35a05e9c6fdcfa82 (patch)
tree6e98258fe6fcff0e992104dcb09a57be4de6ee86 /src/plugins/projectexplorer/projectexplorersettingspage.ui
parent7c2afcf179b9d37d77a78d7cfbd6f7159b951555 (diff)
downloadqt-creator-db2dd3e277382cf9238904de35a05e9c6fdcfa82.tar.gz
Option to merge stderr in application output
When activated shows correct interleaving of stdout and stderr messages, but looses stderr highlighting. Task-number: QTCREATORBUG-4821 Reviewed-by: ossi
Diffstat (limited to 'src/plugins/projectexplorer/projectexplorersettingspage.ui')
-rw-r--r--src/plugins/projectexplorer/projectexplorersettingspage.ui10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.ui b/src/plugins/projectexplorer/projectexplorersettingspage.ui
index bf5343bce4..fde72579f9 100644
--- a/src/plugins/projectexplorer/projectexplorersettingspage.ui
+++ b/src/plugins/projectexplorer/projectexplorersettingspage.ui
@@ -98,6 +98,16 @@
</widget>
</item>
<item>
+ <widget class="QCheckBox" name="mergeStdErrAndStdOutCheckBox">
+ <property name="toolTip">
+ <string>Enabling this option ensures that the order of interleaved messages from stdout and stderr is preserved, at the cost of disabling highlighting of stderr.</string>
+ </property>
+ <property name="text">
+ <string>Merge stderr and stdout</string>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QCheckBox" name="wrapAppOutputCheckBox">
<property name="text">
<string>Word-wrap application output</string>