From b9e37ee852af4cc31d2f8cf6639ed8960cbbac0c Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 12 Oct 2022 14:38:17 +0300 Subject: [PATCH] Android: fix include statement for Android Extras classes use \inheaderfile QtCore/private/qandroidextras_p.h to override the default include statement. Change-Id: I6ab691fc23d04b5f174729e9828039153bc05d1e Reviewed-by: Fabian Kosmale Reviewed-by: Rami Potinkara Reviewed-by: Kai Koehne (cherry picked from commit 89e92a11e7b43a4f99c5a45f2cc641b3b59f5bcc) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/platform/android/qandroidextras.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/corelib/platform/android/qandroidextras.cpp b/src/corelib/platform/android/qandroidextras.cpp index 0fa67eacafe..6de9ed00529 100644 --- a/src/corelib/platform/android/qandroidextras.cpp +++ b/src/corelib/platform/android/qandroidextras.cpp @@ -117,6 +117,7 @@ QAndroidBinder QAndroidParcelPrivate::readBinder() const /*! \class QAndroidParcel + \inheaderfile QtCore/private/qandroidextras_p.h \preliminary \inmodule QtCorePrivate \brief Wraps the most important methods of Android Parcel class. @@ -233,6 +234,7 @@ QJniObject QAndroidParcel::handle() const /*! \class QAndroidBinder + \inheaderfile QtCore/private/qandroidextras_p.h \preliminary \inmodule QtCorePrivate \brief Wraps the most important methods of Android Binder class. @@ -370,6 +372,7 @@ QJniObject QAndroidBinder::handle() const /*! \class QAndroidServiceConnection + \inheaderfile QtCore/private/qandroidextras_p.h \preliminary \inmodule QtCorePrivate \brief Wraps the most important methods of Android ServiceConnection class. @@ -496,6 +499,7 @@ public: /*! \class QAndroidActivityResultReceiver + \inheaderfile QtCore/private/qandroidextras_p.h \preliminary \inmodule QtCorePrivate \since 6.2 @@ -591,6 +595,7 @@ public: /*! \class QAndroidService + \inheaderfile QtCore/private/qandroidextras_p.h \preliminary \inmodule QtCorePrivate \brief Wraps the most important methods of Android Service class. @@ -660,6 +665,7 @@ QAndroidBinder* QAndroidService::onBind(const QAndroidIntent &/*intent*/) /*! \class QAndroidIntent + \inheaderfile QtCore/private/qandroidextras_p.h \preliminary \inmodule QtCorePrivate \brief Wraps the most important methods of Android Intent class.