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

Fix documentation of QAndroidApplication::context

Browse Source 
As of Qt 6.7 we no longer return jobjects from that API. The declared
QJniType::Context type (and similar types) is no longer jobject-like,
they are now QJniObject-like.

Task-number: QTBUG-123900
Change-Id: I215f84ac37907ae2b7950c40c7287590234e4e35
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
(cherry picked from commit 7d9cedec6aca825ea9b2280c4e3f3e30a0b51ccd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2024-04-19 09:56:48 +02:00 committed by Qt Cherry-pick Bot
parent d24b0c05a4
commit e08da35502
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qcoreapplication_platform.h
View File

@ -43,7 +43,7 @@ struct Q_CORE_EXPORT QAndroidApplication
{ {
QT_DECLARE_NATIVE_INTERFACE(QAndroidApplication, 1, QCoreApplication) QT_DECLARE_NATIVE_INTERFACE(QAndroidApplication, 1, QCoreApplication)
#ifdef Q_QDOC #ifdef Q_QDOC
static jobject context(); static QJniObject context();
#else #else
static QtJniTypes::Context context(); static QtJniTypes::Context context();
#endif #endif

4
src/corelib/platform/android/qandroidnativeinterface.cpp
View File

@ -46,9 +46,9 @@ Q_CONSTINIT static QBasicMutex g_pendingRunnablesMutex;
QT_DEFINE_NATIVE_INTERFACE(QAndroidApplication); QT_DEFINE_NATIVE_INTERFACE(QAndroidApplication);
/*! /*!
\fn jobject QNativeInterface::QAndroidApplication::context() \fn QJniObject QNativeInterface::QAndroidApplication::context()
Returns the Android context as a \c jobject. The context is an \c Activity Returns the Android context as a \c QJniObject. The context is an \c Activity
if the main activity object is valid. Otherwise, the context is a \c Service. if the main activity object is valid. Otherwise, the context is a \c Service.
\since 6.2 \since 6.2