diff options
| author | Yoann Lopes <yoann.lopes@qt.io> | 2016-08-01 11:52:05 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-08-01 11:52:05 +0200 |
| commit | 339944b284e9dd11302dd013f9d9a10ad0d9055a (patch) | |
| tree | c2952d186b1dbc6f2380448fa2cfd9ec55043da6 /src/plugins/android/src/qandroidmediaserviceplugin.cpp | |
| parent | 53d0a1e5454f4e5beecdea19acb9df11c87cc375 (diff) | |
| parent | d7d31d63db5f0029a4a5e24d998601baee8bade0 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ic29cb09048003f18ff86d4546cd547be715eaec8
Diffstat (limited to 'src/plugins/android/src/qandroidmediaserviceplugin.cpp')
| -rw-r--r-- | src/plugins/android/src/qandroidmediaserviceplugin.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/android/src/qandroidmediaserviceplugin.cpp b/src/plugins/android/src/qandroidmediaserviceplugin.cpp index 87de7d561..0de231c9d 100644 --- a/src/plugins/android/src/qandroidmediaserviceplugin.cpp +++ b/src/plugins/android/src/qandroidmediaserviceplugin.cpp @@ -150,6 +150,11 @@ QT_END_NAMESPACE Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) { + static bool initialized = false; + if (initialized) + return JNI_VERSION_1_6; + initialized = true; + QT_USE_NAMESPACE typedef union { JNIEnv *nativeEnvironment; |