summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2019-01-31 08:32:15 +0100
committerEike Ziller <eike.ziller@qt.io>2019-01-31 08:32:15 +0100
commit1f0b6252f52d40305c9a1e0cdf72429448fdab2d (patch)
tree63cbead2a154b2f6f6e719c39b8f73d845ee00af
parentadc907ae6919ae38546d8ac52e5a1e778ce3b1c7 (diff)
parent0bf2b2501baf379c5a6f81b4ad9cf439f7536198 (diff)
Merge remote-tracking branch 'origin/4.8'
-rw-r--r--plugins/haskell/filecache.cpp2
-rw-r--r--plugins/haskell/ghcmod.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/haskell/filecache.cpp b/plugins/haskell/filecache.cpp
index 0495a8b..55ee552 100644
--- a/plugins/haskell/filecache.cpp
+++ b/plugins/haskell/filecache.cpp
@@ -34,7 +34,7 @@
#include <QTemporaryFile>
#include <QTextDocument>
-Q_LOGGING_CATEGORY(cacheLog, "qtc.haskell.filecache")
+Q_LOGGING_CATEGORY(cacheLog, "qtc.haskell.filecache", QtWarningMsg)
using namespace Core;
using namespace TextEditor;
diff --git a/plugins/haskell/ghcmod.cpp b/plugins/haskell/ghcmod.cpp
index fbfabe7..e110230 100644
--- a/plugins/haskell/ghcmod.cpp
+++ b/plugins/haskell/ghcmod.cpp
@@ -43,8 +43,8 @@
#include <functional>
-Q_LOGGING_CATEGORY(ghcModLog, "qtc.haskell.ghcmod")
-Q_LOGGING_CATEGORY(asyncGhcModLog, "qtc.haskell.ghcmod.async")
+Q_LOGGING_CATEGORY(ghcModLog, "qtc.haskell.ghcmod", QtWarningMsg)
+Q_LOGGING_CATEGORY(asyncGhcModLog, "qtc.haskell.ghcmod.async", QtWarningMsg)
// TODO do not hardcode
const int kTimeoutMS = 10 * 1000;