summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-27 16:36:04 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-27 16:36:04 +0200
commite6d051092a3a8671732dbe31badd0f712a28137f (patch)
treeaf22c25569ef6a9e37c5a1276d1ed1b1447b811d
parent9f93ec7f85f856be98eed42a4e9d1d85032b0908 (diff)
parented0b4ed792504dc68d2f009ca19d69ef856002ba (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts: .qmake.conf Change-Id: Ib6ec0928ab14e075b35648ce0da4efc293be9c94
-rw-r--r--dist/changes-5.12.424
-rw-r--r--src/plugins/sensors/android/sensormanager.cpp2
2 files changed, 25 insertions, 1 deletions
diff --git a/dist/changes-5.12.4 b/dist/changes-5.12.4
new file mode 100644
index 00000000..46807dbe
--- /dev/null
+++ b/dist/changes-5.12.4
@@ -0,0 +1,24 @@
+Qt 5.12.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.3.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Android *
+****************************************************************************
+
+ - Rewrite Qt Android Sensors using NDK API.
diff --git a/src/plugins/sensors/android/sensormanager.cpp b/src/plugins/sensors/android/sensormanager.cpp
index 590f478c..542e54c9 100644
--- a/src/plugins/sensors/android/sensormanager.cpp
+++ b/src/plugins/sensors/android/sensormanager.cpp
@@ -73,7 +73,7 @@ ALooper *SensorManager::looper() const
static inline ASensorManager* androidManager()
{
#if __ANDROID_API__ >= 26
- retrun ASensorManager_getInstanceForPackage(QJNIObjectPrivate{QtAndroidPrivate::context()}
+ return ASensorManager_getInstanceForPackage(QJNIObjectPrivate{QtAndroidPrivate::context()}
.callObjectMethod("getPackageName", "()Ljava/lang/String;")
.toString().toUtf8().constData());
#else