diff options
Diffstat (limited to 'src/multimedia/platform/android/mediaplayer/qandroidmetadata.cpp')
-rw-r--r-- | src/multimedia/platform/android/mediaplayer/qandroidmetadata.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/multimedia/platform/android/mediaplayer/qandroidmetadata.cpp b/src/multimedia/platform/android/mediaplayer/qandroidmetadata.cpp index 4765fa0ad..93d3b246d 100644 --- a/src/multimedia/platform/android/mediaplayer/qandroidmetadata.cpp +++ b/src/multimedia/platform/android/mediaplayer/qandroidmetadata.cpp @@ -46,6 +46,7 @@ #include <QtCore/qlist.h> #include <QtConcurrent/qtconcurrentrun.h> #include <QLoggingCategory> +#include <private/qiso639_2_p.h> QT_BEGIN_NAMESPACE @@ -170,15 +171,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 QtMultimediaPrivate::fromIso639(language.toStdString().c_str()); } QAndroidMetaData::QAndroidMetaData(int trackType, int androidTrackType, int androidTrackNumber, |