diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2021-06-22 12:38:18 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-25 08:00:57 +0000 |
| commit | b06664766b11addde44ed4e75b3967b6aa411c9c (patch) | |
| tree | 5338dc689198b2990b983c0156b729e294480ea9 | |
| parent | a8b5dd26580c7f9ced00c1d0b7d51618e0262ed8 (diff) | |
Fix QPermission::PermisionType's mis-spelling of permission
Depends on upstream change in qtbase to fix the declaration there; is
a prerequisite of a subsequent removal of an alias for the typo'd name.
Task-number: QTBUG-94407
Change-Id: I4f58653483be96c9462ae4f6a189cb88e4de9c7c
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 61c7d0c2e400b54d68763f28bc841232e81937fd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/multimedia/platform/android/audio/qandroidaudiosource.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/platform/android/common/qandroidmultimediautils.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/platform/android/audio/qandroidaudiosource.cpp b/src/multimedia/platform/android/audio/qandroidaudiosource.cpp index 3bd8d564e..e898f8369 100644 --- a/src/multimedia/platform/android/audio/qandroidaudiosource.cpp +++ b/src/multimedia/platform/android/audio/qandroidaudiosource.cpp @@ -61,7 +61,7 @@ static bool hasRecordingPermission() if (QNativeInterface::QAndroidApplication::sdkVersion() < 23) return true; - const QPermission::PermisionType key(QPermission::Microphone); + const QPermission::PermissionType key(QPermission::Microphone); // Permission already granted? if (QCoreApplication::checkPermission(key).result() == QPermission::Authorized) return true; diff --git a/src/multimedia/platform/android/common/qandroidmultimediautils.cpp b/src/multimedia/platform/android/common/qandroidmultimediautils.cpp index 201744444..c2ce4eca6 100644 --- a/src/multimedia/platform/android/common/qandroidmultimediautils.cpp +++ b/src/multimedia/platform/android/common/qandroidmultimediautils.cpp @@ -108,7 +108,7 @@ AndroidCamera::ImageFormat qt_androidImageFormatFromPixelFormat(QVideoFrameForma } } -static bool androidRequestPermission(QPermission::PermisionType key) +static bool androidRequestPermission(QPermission::PermissionType key) { if (QNativeInterface::QAndroidApplication::sdkVersion() < 23) return true; |