diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-29 00:38:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-29 00:38:01 +0200 |
| commit | cdb56c42fc1145ad25560720fb95df2bfa760a20 (patch) | |
| tree | 4dbe524a511b9343464e8509bd5352715aebdfa9 /src/corelib | |
| parent | 87583738f960e83918da3b66e455e75c144fbf8e (diff) | |
| parent | e918334045612ec2c7c6203845ad05c4a1972e87 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
mkspecs/features/uikit/xcodebuild.mk
tests/auto/other/lancelot/tst_lancelot.cpp
tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
Change-Id: Ia0ae2de86094120281abd445138877c2cc3e882c
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 } |