From 7d9cedec6aca825ea9b2280c4e3f3e30a0b51ccd Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 19 Apr 2024 09:56:48 +0200 Subject: Fix documentation of QAndroidApplication::context 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 Pick-to: 6.7 Change-Id: I215f84ac37907ae2b7950c40c7287590234e4e35 Reviewed-by: Assam Boudjelthia Reviewed-by: Juha Vuolle --- src/corelib/kernel/qcoreapplication_platform.h | 2 +- src/corelib/platform/android/qandroidnativeinterface.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/kernel/qcoreapplication_platform.h b/src/corelib/kernel/qcoreapplication_platform.h index e430f3495b..d5f266179e 100644 --- a/src/corelib/kernel/qcoreapplication_platform.h +++ b/src/corelib/kernel/qcoreapplication_platform.h @@ -43,7 +43,7 @@ struct Q_CORE_EXPORT QAndroidApplication { QT_DECLARE_NATIVE_INTERFACE(QAndroidApplication, 1, QCoreApplication) #ifdef Q_QDOC - static jobject context(); + static QJniObject context(); #else static QtJniTypes::Context context(); #endif diff --git a/src/corelib/platform/android/qandroidnativeinterface.cpp b/src/corelib/platform/android/qandroidnativeinterface.cpp index e9a5957895..fc3a09c78b 100644 --- a/src/corelib/platform/android/qandroidnativeinterface.cpp +++ b/src/corelib/platform/android/qandroidnativeinterface.cpp @@ -46,9 +46,9 @@ Q_CONSTINIT static QBasicMutex g_pendingRunnablesMutex; 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. \since 6.2 -- cgit v1.2.3