diff options
Diffstat (limited to 'src/corelib/kernel/qcoreapplication_platform.h')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication_platform.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/kernel/qcoreapplication_platform.h b/src/corelib/kernel/qcoreapplication_platform.h index fe0fee915b..d5f266179e 100644 --- a/src/corelib/kernel/qcoreapplication_platform.h +++ b/src/corelib/kernel/qcoreapplication_platform.h @@ -17,13 +17,13 @@ #include <QtCore/qnativeinterface.h> #include <QtCore/qcoreapplication.h> -#if defined(Q_OS_ANDROID) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_ANDROID) || defined(Q_QDOC) #include <QtCore/qjnitypes.h> #if QT_CONFIG(future) && !defined(QT_NO_QOBJECT) #include <QtCore/qfuture.h> #include <QtCore/qvariant.h> #endif -#endif // #if defined(Q_OS_ANDROID) || defined(Q_CLANG_QDOC) +#endif // #if defined(Q_OS_ANDROID) || defined(Q_QDOC) #if defined(Q_OS_ANDROID) class _jobject; @@ -33,17 +33,17 @@ typedef _jobject* jobject; QT_BEGIN_NAMESPACE #if defined(Q_OS_ANDROID) -Q_DECLARE_JNI_TYPE(Context, "Landroid/content/Context;") +Q_DECLARE_JNI_CLASS(Context, "android/content/Context") #endif namespace QNativeInterface { -#if defined(Q_OS_ANDROID) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_ANDROID) || defined(Q_QDOC) struct Q_CORE_EXPORT QAndroidApplication { QT_DECLARE_NATIVE_INTERFACE(QAndroidApplication, 1, QCoreApplication) -#ifdef Q_CLANG_QDOC - static jobject context(); +#ifdef Q_QDOC + static QJniObject context(); #else static QtJniTypes::Context context(); #endif |