diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-29 07:42:39 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-09-29 07:42:39 +0000 |
| commit | 75aea3ff5eec4a5c8f4184e14a90f4a5e3a577b0 (patch) | |
| tree | fcf23325ec038627de8861c9e8f9a4aa2223feef /src/corelib | |
| parent | 433e5ccf507fc153db589df80655618f241af0c3 (diff) | |
| parent | cdb56c42fc1145ad25560720fb95df2bfa760a20 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
Diffstat (limited to 'src/corelib')
| -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 6c7cd9c5c6..0ca6829564 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -1138,6 +1138,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 } |