summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@theqtcompany.com>2016-05-26 15:27:41 +0200
committerChristian Kandeler <christian.kandeler@theqtcompany.com>2016-05-27 17:42:47 +0000
commitd89fc0bfeaecc367d88ac26e57e255a7ae1fb5fe (patch)
tree7043a503fd749aa271ac6a4478eb3a3c9d558a9c
parent74b6d2e70851514c02c570216801a832c099c268 (diff)
downloadqt-creator-d89fc0bfeaecc367d88ac26e57e255a7ae1fb5fe.tar.gz
QbsProjectManager: Logging improvements.
- Make messages with level "warning" or "error" appear in the Issues pane. - Do not suppress messages of level "info". People add "console.info()" calls into their projects for debugging and they expect to see the output in Creator. Task-number: QTCREATORBUG-15983 Change-Id: I6c84bc1ef08dbf85d7e88af864b18f64fcedfe1a Reviewed-by: Jake Petroules <jake.petroules@qt.io>
-rw-r--r--src/plugins/qbsprojectmanager/qbslogsink.cpp4
-rw-r--r--src/plugins/qbsprojectmanager/qbsprojectmanager.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/qbsprojectmanager/qbslogsink.cpp b/src/plugins/qbsprojectmanager/qbslogsink.cpp
index 30c1f3780c..2b28dd1c20 100644
--- a/src/plugins/qbsprojectmanager/qbslogsink.cpp
+++ b/src/plugins/qbsprojectmanager/qbslogsink.cpp
@@ -79,6 +79,10 @@ void QbsLogSink::doPrintMessage(qbs::LoggerLevel level, const QString &message,
{
QMutexLocker l(&m_mutex);
+ if (level <= qbs::LoggerWarning) {
+ doPrintWarning(qbs::ErrorInfo(message));
+ return;
+ }
m_messages.append(qbs::logLevelTag(level) + message);
}
QMetaObject::invokeMethod(this, "sendMessages", Qt::QueuedConnection);
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
index b0805f65a0..34eb9c693c 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
@@ -78,7 +78,7 @@ QbsManager::QbsManager() :
this, &QbsManager::updateAllProfiles);
m_logSink = new QbsLogSink(this);
- int level = qbs::LoggerWarning;
+ int level = qbs::LoggerInfo;
const QString levelEnv = QString::fromLocal8Bit(qgetenv("QBS_LOG_LEVEL"));
if (!levelEnv.isEmpty()) {
bool ok = false;