diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-23 22:28:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-23 22:28:33 +0200 |
| commit | 680dd3313cd15ab4d9d6b8b3bde77aabbd8de0b0 (patch) | |
| tree | 4e8f59ad3012be8aa844288bec9e6a8216ba6056 /src/corelib/global/qlogging.cpp | |
| parent | bde3384c9e3423b2b5fec565a32e49a1f796cd68 (diff) | |
| parent | d95cb94baa6302bea6ad57a9690453e9b618421e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/corelib/global/qlogging.cpp
Change-Id: I9cc8f25ad897efab6a42cb5c5161b1c9402952f0
Diffstat (limited to 'src/corelib/global/qlogging.cpp')
| -rw-r--r-- | src/corelib/global/qlogging.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index 5842b26ecb..e8262aa0c0 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -1136,6 +1136,7 @@ void QMessagePattern::setPattern(const QString &pattern) backtraceArgs.append(backtraceParams); #else error += QLatin1String("QT_MESSAGE_PATTERN: %{backtrace} is not supported by this Qt build\n"); + tokens[i] = ""; #endif } |