From fb488b0f14ff8b480100d863b4be1ca0162fc5fb Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Tue, 12 Mar 2013 18:18:55 +0100
Subject: [PATCH] DebuggingHelperBuildTask: Adjust to message manager api
Change-Id: I11e0c5c6811a4319536d92ce1289ba8c86143764
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
src/plugins/qtsupport/debugginghelperbuildtask.cpp | 10 +++++++---
src/plugins/qtsupport/debugginghelperbuildtask.h | 3 ++-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qtsupport/debugginghelperbuildtask.cpp b/src/plugins/qtsupport/debugginghelperbuildtask.cpp
index ce1e291bde1..459aebd9f98 100644
--- a/src/plugins/qtsupport/debugginghelperbuildtask.cpp
+++ b/src/plugins/qtsupport/debugginghelperbuildtask.cpp
@@ -62,8 +62,8 @@ DebuggingHelperBuildTask::DebuggingHelperBuildTask(const BaseQtVersion *version,
qRegisterMetaType<DebuggingHelperBuildTask::Tools>("DebuggingHelperBuildTask::Tools");
// Print result in application ouptut
- connect(this, SIGNAL(logOutput(QString,bool)),
- Core::MessageManager::instance(), SLOT(printToOutputPane(QString,bool)),
+ connect(this, SIGNAL(logOutput(QString,Core::MessageManager::Flag)),
+ Core::MessageManager::instance(), SLOT(printToOutputPane(QString,Core::MessageManager::Flag)),
Qt::QueuedConnection);
//
@@ -264,5 +264,9 @@ void DebuggingHelperBuildTask::log(const QString &output, const QString &error)
logEntry.append(error);
m_log.append(logEntry);
- emit logOutput(logEntry, m_showErrors && !error.isEmpty());
+ Core::MessageManager::PrintToOutputPaneFlag flag = Core::MessageManager::Silent;
+ if (m_showErrors && !error.isEmpty())
+ flag = Core::MessageManager::NoModeSwitch;
+
+ emit logOutput(logEntry, flag);
}
diff --git a/src/plugins/qtsupport/debugginghelperbuildtask.h b/src/plugins/qtsupport/debugginghelperbuildtask.h
index d6d075350c1..d0f19080f8a 100644
--- a/src/plugins/qtsupport/debugginghelperbuildtask.h
+++ b/src/plugins/qtsupport/debugginghelperbuildtask.h
@@ -33,6 +33,7 @@
#include "qtsupport_global.h"
#include <utils/environment.h>
#include <utils/fileutils.h>
+#include <coreplugin/messagemanager.h>
#include <projectexplorer/toolchain.h>
#include <QObject>
@@ -70,7 +71,7 @@ signals:
void finished(int qtVersionId, const QString &output, DebuggingHelperBuildTask::Tools tools);
// used internally
- void logOutput(const QString &output, bool bringToForeground);
+ void logOutput(const QString &output, Core::MessageManager::PrintToOutputPaneFlag flags);
void updateQtVersions(const Utils::FileName &qmakeCommand);
private:
--
GitLab