diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-08 08:20:36 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-08 08:20:36 +0100 |
| commit | cae32bd04d117ba2423a8c4db12f8d2d5b809bcb (patch) | |
| tree | 179cc91b4b34b9e7ec587d576e42d89fc13fec43 /src/corelib/global/qlogging.cpp | |
| parent | e1a70ce495928e8d81e80b11d7dbd4c4913ee438 (diff) | |
| parent | 04f68053df5c90dca6947c6d2a5bb4e6851e62bb (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8.0
Change-Id: I576187a9905802c177ae483e6c29d0f55cf7034d
Diffstat (limited to 'src/corelib/global/qlogging.cpp')
| -rw-r--r-- | src/corelib/global/qlogging.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index f344873276..6984097b70 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -1041,6 +1041,10 @@ void QMessagePattern::setPattern(const QString &pattern) delete [] literals; } delete [] tokens; + timeArgs.clear(); +#ifdef QLOGGING_HAVE_BACKTRACE + backtraceArgs.clear(); +#endif // scanner QList<QString> lexemes; |