diff options
| author | Bartlomiej Moskal <bartlomiej.moskal@qt.io> | 2022-11-15 13:16:00 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-01-09 19:24:21 +0000 |
| commit | 618b4bcde8c41fc8cd477548f32787ccf9bd0554 (patch) | |
| tree | af7f51e65c526cb039e77aa7ce0148574ec11b6d | |
| parent | 986d823e51d41515878f1bb8e570e736a50ad291 (diff) | |
| download | qtmultimedia-618b4bcde8c41fc8cd477548f32787ccf9bd0554.tar.gz | |
Android: Fix for subtitle language metadata detection
The QLocale supports ISO639-2 language tags. That is why we should start
to use QLocale::codeToLanguage in our implementation.
Task-number: QTBUG-97166
Change-Id: I8f62d6b3d7c8be555249792bfe0c6d6f82af217b
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 4b976b27e1a879fd89d786ff0776a275eb5e1938)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/multimedia/android/mediaplayer/qandroidmetadata.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/plugins/multimedia/android/mediaplayer/qandroidmetadata.cpp b/src/plugins/multimedia/android/mediaplayer/qandroidmetadata.cpp index 69617a68c..75ac8b9c6 100644 --- a/src/plugins/multimedia/android/mediaplayer/qandroidmetadata.cpp +++ b/src/plugins/multimedia/android/mediaplayer/qandroidmetadata.cpp @@ -134,15 +134,7 @@ QLocale::Language getLocaleLanguage(const QString &language) if (language == QLatin1String("und") || language == QStringLiteral("mis")) return QLocale::AnyLanguage; - QLocale locale(language); - - if (locale == QLocale::c()) { - qCWarning(lcaMetadata) << "Could not parse language:" << language - << ". It is not a valid Unicode CLDR language code."; - return QLocale::AnyLanguage; - } - - return locale.language(); + return QLocale::codeToLanguage(language, QLocale::ISO639Part2); } QAndroidMetaData::QAndroidMetaData(int trackType, int androidTrackType, int androidTrackNumber, |