diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:51 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:52 +0200 |
| commit | 881ceeff428c377d02ae3881beccdbb028385075 (patch) | |
| tree | 65bd4335d7f67b81b04e33f2cbb17a41cf966dd8 /src/testlib/qplaintestlogger.cpp | |
| parent | b3d2c867ed14cd6337d5e32b8750f198b5b7d331 (diff) | |
| parent | 106487387d493dab934e19b33bfed55b8df62d67 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14
Diffstat (limited to 'src/testlib/qplaintestlogger.cpp')
| -rw-r--r-- | src/testlib/qplaintestlogger.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp index 703c6aa54e..e58daa528d 100644 --- a/src/testlib/qplaintestlogger.cpp +++ b/src/testlib/qplaintestlogger.cpp @@ -202,7 +202,7 @@ namespace QTest { } #if defined(Q_OS_WIN) -Q_CORE_EXPORT bool qWinLogToStderr(); // defined in qlogging.cpp +Q_CORE_EXPORT bool qt_logging_to_console(); // defined in qlogging.cpp #endif void QPlainTestLogger::outputMessage(const char *str) @@ -218,7 +218,7 @@ void QPlainTestLogger::outputMessage(const char *str) if (stream != stdout) #elif defined(Q_OS_WIN) // log to system log only if output is not redirected, and no console is attached - if (!qWinLogToStderr() && stream == stdout) { + if (!qt_logging_to_console() && stream == stdout) { OutputDebugStringA(str); return; } |