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

 Conflicts:
	src/3rdparty/pcre2/qt_attribution.json

Change-Id: Ibae941cb12662f27bd6962ee02bc235971c59a15

2 files changed, 10 insertions, 14 deletions

diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 0ab9ed6ec2..b4a091765b 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -3700,14 +3700,17 @@ bool QApplicationPrivate::notify_helper(QObject *receiver, QEvent * e)
     // to the ones in QCoreApplicationPrivate::notify_helper; the reason for their
     // duplication is because tracepoint symbols are not exported by QtCore.
     // If you adjust the tracepoints here, consider adjusting QCoreApplicationPrivate too.
-    Q_TRACE_SCOPE(QApplication_notify, receiver, e, e->type());
+    Q_TRACE(QApplication_notify_entry, receiver, e, e->type());
+    bool consumed = false;
+    bool filtered = false;
+    Q_TRACE_EXIT(QApplication_notify_exit, consumed, filtered);
 
     // send to all application event filters
     if (threadRequiresCoreApplication()
         && receiver->d_func()->threadData->thread == mainThread()
         && sendThroughApplicationEventFilters(receiver, e)) {
-        Q_TRACE(QApplication_notify_event_filtered, receiver, e, e->type());
-        return true;
+        filtered = true;
+        return filtered;
     }
 
     if (receiver->isWidgetType()) {
@@ -3729,16 +3732,12 @@ bool QApplicationPrivate::notify_helper(QObject *receiver, QEvent * e)
 
     // send to all receiver event filters
     if (sendThroughObjectEventFilters(receiver, e)) {
-        Q_TRACE(QApplication_notify_event_filtered, receiver, e, e->type());
-        return true;
+        filtered = true;
+        return filtered;
     }
 
-    Q_TRACE(QApplication_notify_before_delivery, receiver, e, e->type());
-
     // deliver the event
-    const bool consumed = receiver->event(e);
-
-    Q_TRACE(QApplication_notify_after_delivery, receiver, e, e->type(), consumed);
+    consumed = receiver->event(e);
 
     QCoreApplicationPrivate::setEventSpontaneous(e, false);
     return consumed;
diff --git a/src/widgets/qtwidgets.tracepoints b/src/widgets/qtwidgets.tracepoints
index b99e46e33f..b967aaf4aa 100644
--- a/src/widgets/qtwidgets.tracepoints
+++ b/src/widgets/qtwidgets.tracepoints
@@ -5,7 +5,4 @@ QT_END_NAMESPACE
 }
 
 QApplication_notify_entry(QObject *receiver, QEvent *event, int type)
-QApplication_notify_exit()
-QApplication_notify_event_filtered(QObject *receiver, QEvent *event, int type)
-QApplication_notify_before_delivery(QObject *receiver, QEvent *event, int type)
-QApplication_notify_after_delivery(QObject *receiver, QEvent *event, int type, bool consumed)
+QApplication_notify_exit(bool consumed, bool filtered)