diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:36:04 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:36:04 +0200 |
| commit | e6d051092a3a8671732dbe31badd0f712a28137f (patch) | |
| tree | af22c25569ef6a9e37c5a1276d1ed1b1447b811d /src | |
| parent | 9f93ec7f85f856be98eed42a4e9d1d85032b0908 (diff) | |
| parent | ed0b4ed792504dc68d2f009ca19d69ef856002ba (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Ib6ec0928ab14e075b35648ce0da4efc293be9c94
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/sensors/android/sensormanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 |