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

Add QtAndroidPrivate::context()

Browse Source 
This simplifies the retrieval of the correct Context object.

Task-number: QTBUG-55102
Change-Id: I303bc5393a7900ceb4bde36e711938f3f49075c1
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Alex Blasche 2016-08-03 08:34:20 +02:00 committed by Alex Blasche
parent 5dd907bf63
commit 958bc5793f
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/kernel/qjnihelpers.cpp
View File

@ -357,6 +357,16 @@ jobject QtAndroidPrivate::service()
return g_jService; return g_jService;
} }
jobject QtAndroidPrivate::context()
{
if (g_jActivity)
return g_jActivity;
if (g_jService)
return g_jService;
return 0;
}
JavaVM *QtAndroidPrivate::javaVM() JavaVM *QtAndroidPrivate::javaVM()
{ {
return g_javaVM; return g_javaVM;

1
src/corelib/kernel/qjnihelpers_p.h
View File

@ -101,6 +101,7 @@ namespace QtAndroidPrivate
Q_CORE_EXPORT jobject activity(); Q_CORE_EXPORT jobject activity();
Q_CORE_EXPORT jobject service(); Q_CORE_EXPORT jobject service();
Q_CORE_EXPORT jobject context();
Q_CORE_EXPORT JavaVM *javaVM(); Q_CORE_EXPORT JavaVM *javaVM();
Q_CORE_EXPORT jint initJNI(JavaVM *vm, JNIEnv *env); Q_CORE_EXPORT jint initJNI(JavaVM *vm, JNIEnv *env);
jobject classLoader(); jobject classLoader();