diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:20:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:20:50 +0200 |
| commit | 914f113067fc770b93b27df17f5aa81a7ba7bad1 (patch) | |
| tree | f685a34b88ad0c93a1412a9563ea41884d498101 | |
| parent | 98fb6869996bed30c09bcf9d0ce67fe474249e60 (diff) | |
| parent | 42dbf4712ed9815b457ec80a2ed56de685fb2b63 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: I3d0c6ed292b1f3aa7c24d0c39a4ecfdd8f380d6c
| -rw-r--r-- | src/gamepad/doc/qtgamepad.qdocconf | 7 | ||||
| -rw-r--r-- | src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/gamepad/doc/qtgamepad.qdocconf b/src/gamepad/doc/qtgamepad.qdocconf index 5f2d1fe..22fa763 100644 --- a/src/gamepad/doc/qtgamepad.qdocconf +++ b/src/gamepad/doc/qtgamepad.qdocconf @@ -4,7 +4,7 @@ project = QtGamepad description = Qt Gamepad Reference Documentation version = $QT_VERSION -examplesinstallpath = qtgamepad +examplesinstallpath = gamepad qhp.projects = QtGamepad @@ -39,7 +39,7 @@ headerdirs += ../ \ sourcedirs += ../ \ ../../plugins -exampledirs += ../../../examples +exampledirs += ../../../examples/gamepad imagedirs += images @@ -49,3 +49,6 @@ Cpp.ignoredirectives += Q_DECLARE_LOGGING_CATEGORY navigation.landingpage = "Qt Gamepad" navigation.qmltypespage = "Qt Gamepad QML Types" navigation.cppclassespage = "Qt Gamepad C++ Classes" + +manifestmeta.thumbnail.names = "QtGamepad/Qt Gamepad Mouse Item Example" \ + "QtGamepad/Qt Gamepad Simple Example" diff --git a/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp b/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp index 492e123..009e0eb 100644 --- a/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp +++ b/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp @@ -608,6 +608,11 @@ void QAndroidGamepadBackend::saveData(const QAndroidGamepadBackend::Mapping &dev JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/) { + static bool initialized = false; + if (initialized) + return JNI_VERSION_1_6; + initialized = true; + JNIEnv* env; // get the JNIEnv pointer. if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) |