Merge remote-tracking branch 'origin/5.13' into dev

 Conflicts:
	mkspecs/win32-clang-msvc/qmake.conf
	src/gui/image/qpnghandler.cpp

Change-Id: Ied79d02912ffb3a307a99483df7db08c7f9d0cd8

3 files changed, 25 insertions, 1 deletions

diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
index a4d86e393b..4941ca45aa 100644
--- a/src/corelib/global/qlogging.cpp
+++ b/src/corelib/global/qlogging.cpp
@@ -57,6 +57,7 @@
 #include "private/qloggingregistry_p.h"
 #include "private/qcoreapplication_p.h"
 #include "private/qsimd_p.h"
+#include <qtcore_tracepoints_p.h>
 #endif
 #ifdef Q_OS_WIN
 #include <qt_windows.h>
@@ -1811,6 +1812,8 @@ static void ungrabMessageHandler() { }
 static void qt_message_print(QtMsgType msgType, const QMessageLogContext &context, const QString &message)
 {
 #ifndef QT_BOOTSTRAPPED
+    Q_TRACE(qt_message_print, msgType, context.category, context.function, context.file, context.line, message);
+
     // qDebug, qWarning, ... macros do not check whether category is enabled
     if (isDefaultCategory(context.category)) {
         if (QLoggingCategory *defaultCategory = QLoggingCategory::defaultCategory()) {
diff --git a/src/corelib/global/qt_pch.h b/src/corelib/global/qt_pch.h
index 76e46374c3..3972991618 100644
--- a/src/corelib/global/qt_pch.h
+++ b/src/corelib/global/qt_pch.h
@@ -60,12 +60,18 @@
 # undef _POSIX_
 #endif
 #include <qcoreapplication.h>
+#include <qcoreevent.h>
+#include <qiodevice.h>
 #include <qlist.h>
 #include <qvariant.h>  /* All moc genereated code has this include */
 #include <qobject.h>
 #include <qregexp.h>
+#include <qscopedpointer.h>
+#include <qshareddata.h>
 #include <qstring.h>
 #include <qstringlist.h>
+#include <qtimer.h>
+#include <qvector.h>
 #if QT_CONFIG(textcodec)
 #include <qtextcodec.h>
 #endif
diff --git a/src/corelib/global/qtrace_p.h b/src/corelib/global/qtrace_p.h
index 56d1f9a318..b72fdd886d 100644
--- a/src/corelib/global/qtrace_p.h
+++ b/src/corelib/global/qtrace_p.h
@@ -52,11 +52,18 @@
 //
 
 /*
- * The Qt tracepoints API consists of only three macros:
+ * The Qt tracepoints API consists of only five macros:
  *
  *     - Q_TRACE(tracepoint, args...)
  *       Fires 'tracepoint' if it is enabled.
  *
+ *     - Q_TRACE_EXIT(tracepoint, args...)
+ *       Fires 'tracepoint' if it is enabled when the current scope exists.
+ *
+ *     - Q_TRACE_SCOPE(tracepoint, args...)
+ *       Wrapper around Q_TRACE/_EXIT to trace entry and exit. First it traces
+ *       `${tracepoint}_entry` and then `${tracepoint}_exit` on scope exit.
+ *
  *     - Q_UNCONDITIONAL_TRACE(tracepoint, args...)
  *       Fires 'tracepoint' unconditionally: no check is performed to query
  *       whether 'tracepoint' is enabled.
@@ -110,17 +117,25 @@
  */
 
 #include <QtCore/qglobal.h>
+#include <QtCore/qscopeguard.h>
 
 QT_BEGIN_NAMESPACE
 
 #if defined(Q_TRACEPOINT) && !defined(QT_BOOTSTRAPPED)
 #  define Q_HAS_TRACEPOINTS 1
 #  define Q_TRACE(x, ...) QtPrivate::trace_ ## x(__VA_ARGS__)
+#  define Q_TRACE_EXIT(x, ...) \
+    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__);
 #  define Q_UNCONDITIONAL_TRACE(x, ...) QtPrivate::do_trace_ ## x(__VA_ARGS__)
 #  define Q_TRACE_ENABLED(x) QtPrivate::trace_ ## x ## _enabled()
 #else
 #  define Q_HAS_TRACEPOINTS 0
 #  define Q_TRACE(x, ...)
+#  define Q_TRACE_EXIT(x, ...)
+#  define Q_TRACE_SCOPE(x, ...)
 #  define Q_UNCONDITIONAL_TRACE(x, ...)
 #  define Q_TRACE_ENABLED(x) false
 #endif // defined(Q_TRACEPOINT) && !defined(QT_BOOTSTRAPPED)