diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-07 11:44:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-07 11:58:30 +0200 |
| commit | c2b553784dfbe0ece90f79709639e27e74359a7d (patch) | |
| tree | 04b0c74c7417a5f1b628d0b18a07f9dd8be1df60 /src/corelib/global/qtrace_p.h | |
| parent | 0b373c2e36a68aedf3731fcb3cd84fd010c2d67c (diff) | |
| parent | 8ea0a82a6a771dd76df2d51c6ef3ed966a5b9b45 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qvariant.h
src/corelib/tools/qlist.h
Done-With: Milian Wolff <milian.wolff@kdab.com>
Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io>
Change-Id: I6803f7239aa137a51a7467fab7cc7a01302a848d
Diffstat (limited to 'src/corelib/global/qtrace_p.h')
| -rw-r--r-- | src/corelib/global/qtrace_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qtrace_p.h b/src/corelib/global/qtrace_p.h index b72fdd886d..d9011c6066 100644 --- a/src/corelib/global/qtrace_p.h +++ b/src/corelib/global/qtrace_p.h @@ -128,7 +128,7 @@ QT_BEGIN_NAMESPACE const auto qTraceExit_ ## x ## __COUNTER__ = qScopeGuard([&]() { Q_TRACE(x, __VA_ARGS__); }); # define Q_TRACE_SCOPE(x, ...) \ Q_TRACE(x ## _entry, __VA_ARGS__); \ - Q_TRACE_EXIT(x ## _exit, __VA_ARGS__); + Q_TRACE_EXIT(x ## _exit); # define Q_UNCONDITIONAL_TRACE(x, ...) QtPrivate::do_trace_ ## x(__VA_ARGS__) # define Q_TRACE_ENABLED(x) QtPrivate::trace_ ## x ## _enabled() #else |