From 24e2e15b81aa1c3efdee19b15a62aee37b53bea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4=C3=A4tt=C3=A4?= <antti.maatta@qt.io>
Date: Tue, 31 Jan 2023 08:18:17 +0200
Subject: [PATCH] Trace: Use includes instead of forward declarations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some platforms do not work with forward declarations, mainly android.

Change-Id: Ie34a30ecb8554d77c1bea4b65a752d63ba819af9
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Hatem ElKharashy <hatem.elkharashy@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit e3fdd9715fa220d909689def10e9b72c14083e09)
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
---
 src/corelib/kernel/qcoreapplication.cpp | 4 +---
 src/gui/image/qimage.cpp                | 4 +---
 src/widgets/kernel/qapplication.cpp     | 3 +++
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index fbf631d85b2..093f01e5c41 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -109,9 +109,7 @@ QT_BEGIN_NAMESPACE
 using namespace Qt::StringLiterals;
 
 Q_TRACE_PREFIX(qtcore,
-   "QT_BEGIN_NAMESPACE" \
-   "class QEvent;"  \
-   "QT_END_NAMESPACE"
+   "#include <qcoreevent.h>"
 );
 Q_TRACE_METADATA(qtcore, "ENUM { AUTO, RANGE User ... MaxUser } QEvent::Type;");
 Q_TRACE_POINT(qtcore, QCoreApplication_postEvent_entry, QObject *receiver, QEvent *event, QEvent::Type type);
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 67ad269f6e5..8eea2f1366f 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -64,9 +64,7 @@ QT_WARNING_DISABLE_MSVC(4723)
     }
 
 Q_TRACE_PREFIX(qtgui,
-   "QT_BEGIN_NAMESPACE" \
-   "class QEvent;"  \
-   "QT_END_NAMESPACE"
+   "#include <qimagereader.h>"
 );
 
 Q_TRACE_METADATA(qtgui,
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 0317884b24c..d5af9ac2784 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -100,6 +100,9 @@ QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
 
+Q_TRACE_PREFIX(qtwidgets,
+   "#include <qcoreevent.h>"
+);
 Q_TRACE_METADATA(qtwidgets, "ENUM { AUTO, RANGE User ... MaxUser } QEvent::Type;");
 Q_TRACE_POINT(qtwidgets, QApplication_notify_entry, QObject *receiver, QEvent *event, QEvent::Type type);
 Q_TRACE_POINT(qtwidgets, QApplication_notify_exit, bool consumed, bool filtered);