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>

2 files changed, 16 insertions, 8 deletions

diff --git a/tests/auto/tools/tools.pro b/tests/auto/tools/tools.pro
index 86ba74340..43719a2f0 100644
--- a/tests/auto/tools/tools.pro
+++ b/tests/auto/tools/tools.pro
@@ -7,8 +7,9 @@ DEFINES += SRCDIR=\\\"$$PWD/\\\"
 QT = core testlib
 CONFIG += depend_includepath testcase
 
+SOURCES += tst_tools.cpp ../../../src/app/qbs/qbstool.cpp
+
 include(../../../src/lib/use.pri)
 include(../../../qbs_version.pri)
 include(../../../src/app/qbs/parser/parser.pri)
-
-SOURCES += tst_tools.cpp ../../../src/app/qbs/qbstool.cpp
+include(../../../src/app/shared/logging/logging.pri)
diff --git a/tests/auto/tools/tst_tools.cpp b/tests/auto/tools/tst_tools.cpp
index 658754d01..3bd21f990 100644
--- a/tests/auto/tools/tst_tools.cpp
+++ b/tests/auto/tools/tst_tools.cpp
@@ -28,8 +28,8 @@
 ****************************************************************************/
 
 #include <app/qbs/parser/commandlineparser.h>
+#include <app/shared/logging/consolelogger.h>
 #include <app/shared/qbssettings.h>
-#include <logging/logger.h>
 #include <tools/buildoptions.h>
 #include <tools/error.h>
 #include <tools/fileinfo.h>
@@ -41,12 +41,19 @@
 #include <QtTest>
 
 using namespace qbs;
+using namespace Internal;
 
 static SettingsPtr settings = qbsSettings();
 
 class TestTools : public QObject
 {
     Q_OBJECT
+public:
+    TestTools()
+    {
+        ConsoleLogger::instance().logSink()->setEnabled(false);
+    }
+
 private slots:
     void testValidCommandLine()
     {
@@ -62,7 +69,7 @@ private slots:
         CommandLineParser parser;
 
         QVERIFY(parser.parseCommandLine(args, settings.data()));
-        QCOMPARE(Logger::instance().level(), LoggerTrace);
+        QCOMPARE(ConsoleLogger::instance().logSink()->logLevel(), LoggerTrace);
         QCOMPARE(parser.command(), BuildCommandType);
         QCOMPARE(parser.products(), QStringList() << "blubb");
         QCOMPARE(parser.buildOptions().changedFiles.count(), 2);
@@ -70,18 +77,18 @@ private slots:
         QVERIFY(parser.force());
 
         QVERIFY(parser.parseCommandLine(QStringList() << "-vvvqqq" << fileArgs, settings.data()));
-        QCOMPARE(Logger::instance().level(), Logger::defaultLevel());
+        QCOMPARE(ConsoleLogger::instance().logSink()->logLevel(), defaultLogLevel());
         QVERIFY(!parser.force());
 
         QVERIFY(parser.parseCommandLine(QStringList() << "-vvqqq" << fileArgs, settings.data()));
-        QCOMPARE(Logger::instance().level(), LoggerWarning);
+        QCOMPARE(ConsoleLogger::instance().logSink()->logLevel(), LoggerWarning);
 
         QVERIFY(parser.parseCommandLine(QStringList() << "-vvvqq" << fileArgs, settings.data()));
-        QCOMPARE(Logger::instance().level(), LoggerDebug);
+        QCOMPARE(ConsoleLogger::instance().logSink()->logLevel(), LoggerDebug);
 
         QVERIFY(parser.parseCommandLine(QStringList() << "--log-level" << "trace" << fileArgs,
                                         settings.data()));
-        QCOMPARE(Logger::instance().level(), LoggerTrace);
+        QCOMPARE(ConsoleLogger::instance().logSink()->logLevel(), LoggerTrace);
     }
 
     void testInvalidCommandLine()