aboutsummaryrefslogtreecommitdiffstats
path: root/src/share
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2015-01-30 12:12:02 +0100
committerKai Koehne <kai.koehne@theqtcompany.com>2015-02-02 12:28:18 +0000
commit74ce6e409d690b7d56fb4ffd814ef03d0af886fe (patch)
treea806ce72ed9bb9031e1ea80d2b751759dded8e19 /src/share
parent7a188fe70a488c18620d0ee473f3cbfbc15af7a7 (diff)
Make sure qmlviewer/qmlscene application output is printed
Qmlscene and qmlviewer are GUI applications. The heuristic to detect where to print application output (windows log or stderr) has changed in Qt 5.4, which caused the qmlscene, qmlviewer external tools to not print output anymore into General Messages. Work around this by forcing the tools to always print to stderr. Task-number: QTCREATORBUG-13753 Change-Id: Iceee600dd402032674fd3ee11e0bd920793659d2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.com>
Diffstat (limited to 'src/share')
-rw-r--r--src/share/qtcreator/externaltools/qmlscene.xml1
-rw-r--r--src/share/qtcreator/externaltools/qmlviewer.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/share/qtcreator/externaltools/qmlscene.xml b/src/share/qtcreator/externaltools/qmlscene.xml
index 0de49f23a4..800487848b 100644
--- a/src/share/qtcreator/externaltools/qmlscene.xml
+++ b/src/share/qtcreator/externaltools/qmlscene.xml
@@ -40,5 +40,6 @@
<path>qmlscene</path>
<arguments>%{CurrentDocument:FilePath}</arguments>
<workingdirectory>%{CurrentDocument:Path}</workingdirectory>
+ <environment>QT_LOGGING_TO_CONSOLE%3D1</environment>
</executable>
</externaltool>
diff --git a/src/share/qtcreator/externaltools/qmlviewer.xml b/src/share/qtcreator/externaltools/qmlviewer.xml
index 20be918337..127216443b 100644
--- a/src/share/qtcreator/externaltools/qmlviewer.xml
+++ b/src/share/qtcreator/externaltools/qmlviewer.xml
@@ -40,5 +40,6 @@
<path>qmlviewer</path>
<arguments>%{CurrentDocument:FilePath}</arguments>
<workingdirectory>%{CurrentDocument:Path}</workingdirectory>
+ <environment>QT_LOGGING_TO_CONSOLE%3D1</environment>
</executable>
</externaltool>