summaryrefslogtreecommitdiff
path: root/src/lib/buildgraph/abstractcommandexecutor.h
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2013-01-31 18:23:59 +0100
committerChristian Kandeler <christian.kandeler@digia.com>2013-02-06 10:36:05 +0100
commitaea6cbfa9d96f3f76bbc3b81362c54c9322b3fcb (patch)
treec140b905b53b01e509ad923a12e5b31f043f3361 /src/lib/buildgraph/abstractcommandexecutor.h
parente5545733e8f63f62d499e73a27a72fc898a58e4e (diff)
downloadqbs-aea6cbfa9d96f3f76bbc3b81362c54c9322b3fcb.tar.gz
Remove global log sink.
Applications may not want to use the same log sink for all builds. The logging facility is also decoupled from the command-line client in other ways: - The LogWriter modifiers for output channel and text color are gone, since this type of decision should not be made by low-level code. Instead, the "highlight" string can be forwarded to the log sink. - The console logger now lives in app/shared, as it must never be used by library code. Change-Id: I8863a554c9b74577320ef23f6f934a74e0f0cbb0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/buildgraph/abstractcommandexecutor.h')
-rw-r--r--src/lib/buildgraph/abstractcommandexecutor.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/buildgraph/abstractcommandexecutor.h b/src/lib/buildgraph/abstractcommandexecutor.h
index 1ba08759b..e372f6440 100644
--- a/src/lib/buildgraph/abstractcommandexecutor.h
+++ b/src/lib/buildgraph/abstractcommandexecutor.h
@@ -30,6 +30,8 @@
#ifndef QBS_ABSTRACTCOMMANDEXECUTOR_H
#define QBS_ABSTRACTCOMMANDEXECUTOR_H
+#include <logging/logger.h>
+
#include <QObject>
QT_BEGIN_NAMESPACE
@@ -47,7 +49,7 @@ class AbstractCommandExecutor : public QObject
{
Q_OBJECT
public:
- explicit AbstractCommandExecutor(QObject *parent = 0);
+ explicit AbstractCommandExecutor(const Internal::Logger &logger, QObject *parent = 0);
void setMainThreadScriptEngine(QScriptEngine *engine) { m_mainThreadScriptEngine = engine; }
void setDryRunEnabled(bool enabled) { m_dryRun = enabled; }
@@ -67,6 +69,7 @@ protected:
Transformer *transformer() const { return m_transformer; }
QScriptEngine *scriptEngine() const { return m_mainThreadScriptEngine; }
bool dryRun() const { return m_dryRun; }
+ Internal::Logger logger() const { return m_logger; }
private:
virtual void doStart() = 0;
@@ -76,6 +79,7 @@ private:
Transformer *m_transformer;
QScriptEngine *m_mainThreadScriptEngine;
bool m_dryRun;
+ Internal::Logger m_logger;
};
} // namespace Internal