diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-01-31 18:23:59 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-02-06 10:36:05 +0100 |
| commit | aea6cbfa9d96f3f76bbc3b81362c54c9322b3fcb (patch) | |
| tree | c140b905b53b01e509ad923a12e5b31f043f3361 /tests/auto/language | |
| parent | e5545733e8f63f62d499e73a27a72fc898a58e4e (diff) | |
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 'tests/auto/language')
| -rw-r--r-- | tests/auto/language/language.pro | 5 | ||||
| -rw-r--r-- | tests/auto/language/tst_language.cpp | 5 | ||||
| -rw-r--r-- | tests/auto/language/tst_language.h | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/tests/auto/language/language.pro b/tests/auto/language/language.pro index 235e48d52..2e4b599d8 100644 --- a/tests/auto/language/language.pro +++ b/tests/auto/language/language.pro @@ -7,8 +7,6 @@ DEFINES += SRCDIR=\\\"$$PWD/\\\" QT = core testlib CONFIG += depend_includepath testcase -include(../../../src/lib/use.pri) - HEADERS += \ tst_language.h @@ -18,3 +16,6 @@ SOURCES += \ OTHER_FILES += \ $$PWD/testdata/* \ testdata/outerInGroup.qbs + +include(../../../src/lib/use.pri) +include(../../../src/app/shared/logging/logging.pri) diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp index e1ff68167..c737b1ccb 100644 --- a/tests/auto/language/tst_language.cpp +++ b/tests/auto/language/tst_language.cpp @@ -29,6 +29,7 @@ #include "tst_language.h" +#include <app/shared/logging/consolelogger.h> #include <language/identifiersearch.h> #include <language/language.h> #include <language/scriptengine.h> @@ -74,8 +75,8 @@ void TestLanguage::initTestCase() { //Logger::instance().setLogSink(new ConsolePrintLogSink); //Logger::instance().setLevel(LoggerTrace); - ScriptEngine *engine = new ScriptEngine(this); - loader = new Loader(engine, m_settings.data()); + ScriptEngine *engine = new ScriptEngine(ConsoleLogger::instance(), this); + loader = new Loader(engine, m_settings.data(), ConsoleLogger::instance()); loader->setSearchPaths(QStringList() << QLatin1String(SRCDIR "../../../share/qbs") << QLatin1String(SRCDIR "testdata")); diff --git a/tests/auto/language/tst_language.h b/tests/auto/language/tst_language.h index 02112c74e..831eebaf6 100644 --- a/tests/auto/language/tst_language.h +++ b/tests/auto/language/tst_language.h @@ -33,12 +33,11 @@ #include <app/shared/qbssettings.h> #include <language/forward_decls.h> #include <language/loader.h> -#include <logging/consolelogger.h> -#include <logging/logger.h> #include <tools/setupprojectparameters.h> #include <QtTest> using namespace qbs; +using namespace Internal; class TestLanguage : public QObject { |