Trace: Use includes instead of forward declarations

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

Pick-to: 6.5
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>

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);

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,

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);