1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: fix include statement for Android Extras classes

Browse Source 
use \inheaderfile QtCore/private/qandroidextras_p.h to override the
default include statement.

Change-Id: I6ab691fc23d04b5f174729e9828039153bc05d1e
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit 89e92a11e7b43a4f99c5a45f2cc641b3b59f5bcc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Assam Boudjelthia 2022-10-12 14:38:17 +03:00 committed by Qt Cherry-pick Bot
parent c3d87de971
commit b9e37ee852
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/platform/android/qandroidextras.cpp
View File

@ -117,6 +117,7 @@ QAndroidBinder QAndroidParcelPrivate::readBinder() const
/*! /*!
\class QAndroidParcel \class QAndroidParcel
\inheaderfile QtCore/private/qandroidextras_p.h
\preliminary \preliminary
\inmodule QtCorePrivate \inmodule QtCorePrivate
\brief Wraps the most important methods of Android Parcel class. \brief Wraps the most important methods of Android Parcel class.
@ -233,6 +234,7 @@ QJniObject QAndroidParcel::handle() const
/*! /*!
\class QAndroidBinder \class QAndroidBinder
\inheaderfile QtCore/private/qandroidextras_p.h
\preliminary \preliminary
\inmodule QtCorePrivate \inmodule QtCorePrivate
\brief Wraps the most important methods of Android Binder class. \brief Wraps the most important methods of Android Binder class.
@ -370,6 +372,7 @@ QJniObject QAndroidBinder::handle() const
/*! /*!
\class QAndroidServiceConnection \class QAndroidServiceConnection
\inheaderfile QtCore/private/qandroidextras_p.h
\preliminary \preliminary
\inmodule QtCorePrivate \inmodule QtCorePrivate
\brief Wraps the most important methods of Android ServiceConnection class. \brief Wraps the most important methods of Android ServiceConnection class.
@ -496,6 +499,7 @@ public:
/*! /*!
\class QAndroidActivityResultReceiver \class QAndroidActivityResultReceiver
\inheaderfile QtCore/private/qandroidextras_p.h
\preliminary \preliminary
\inmodule QtCorePrivate \inmodule QtCorePrivate
\since 6.2 \since 6.2
@ -591,6 +595,7 @@ public:
/*! /*!
\class QAndroidService \class QAndroidService
\inheaderfile QtCore/private/qandroidextras_p.h
\preliminary \preliminary
\inmodule QtCorePrivate \inmodule QtCorePrivate
\brief Wraps the most important methods of Android Service class. \brief Wraps the most important methods of Android Service class.
@ -660,6 +665,7 @@ QAndroidBinder* QAndroidService::onBind(const QAndroidIntent &/*intent*/)
/*! /*!
\class QAndroidIntent \class QAndroidIntent
\inheaderfile QtCore/private/qandroidextras_p.h
\preliminary \preliminary
\inmodule QtCorePrivate \inmodule QtCorePrivate
\brief Wraps the most important methods of Android Intent class. \brief Wraps the most important methods of Android Intent class.