From 5f62202e6c89269da3e9faaea4c88d0f19416cc1 Mon Sep 17 00:00:00 2001
From: Milian Wolff <milian.wolff@kdab.com>
Date: Tue, 26 Mar 2019 15:23:48 +0100
Subject: Add tracepoint to qt_message_print

This allows us to deduce a lot about what a Qt application is doing,
since the debug output usually contains a lot of information.

Change-Id: I28a18afd151a1640a44ba8c7c9cd87d5d66c99b0
Reviewed-by: Christoph Sterz <christoph.sterz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/global/qlogging.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/corelib/global')

diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
index 168934c202..30232170fb 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()) {
-- 
cgit v1.2.3


From 127518deda5a05fda2ce24be98aaaeb7b975f163 Mon Sep 17 00:00:00 2001
From: Milian Wolff <milian.wolff@kdab.com>
Date: Wed, 27 Mar 2019 13:56:57 +0100
Subject: Introduce Q_TRACE_SCOPE to simplify tracing of a function entry/exit

Additionally, we also add a Q_TRACE_EXIT which runs a trace point when
the scope is exited, leveraging qScopeGuard behind the scenes.
Q_TRACE_SCOPE uses Q_TRACE_EXIT internally - the difference is that
the _SCOPE version enforces the naming scheme of _entry / _exit for the
tracepoints, whereas Q_TRACE_EXIT can be used generically.

Change-Id: I4a2f5ea09f451fcf664d07fd493b679f7527ac06
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/global/qtrace_p.h | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'src/corelib/global')

diff --git a/src/corelib/global/qtrace_p.h b/src/corelib/global/qtrace_p.h
index 3d04a7311d..20f2beac98 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,15 +117,23 @@
  */
 
 #include <QtCore/qglobal.h>
+#include <QtCore/qscopeguard.h>
 
 QT_BEGIN_NAMESPACE
 
 #if defined(Q_TRACEPOINT) && !defined(QT_BOOTSTRAPPED)
 #  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_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)
-- 
cgit v1.2.3


From fe7a8d61d1428f4d316c2a6884d8dfb8190520f0 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 3 Apr 2019 14:14:32 +0200
Subject: Update precompiled headers

Include many headers that are commonly used now, and avoid listing them
twice.

Change-Id: I679dc24cff2cb3a3c9c18585ec78007ab3550743
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/global/qt_pch.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/corelib/global')

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
-- 
cgit v1.2.3