diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-06 00:01:15 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-11-06 00:01:16 +0000 |
| commit | 79c5c68dca095db30ab5dd2920881dfe3098a3e1 (patch) | |
| tree | 23d9afc2595ea668964d7dcd5304eca7bce62ba8 /src/corelib/mimetypes/qmimeprovider.cpp | |
| parent | 6963efb396f7f206afb2f3f9655f26b0c21b6a05 (diff) | |
| parent | 290aac23a756522385b3200c84fd6118dc94d132 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/mimetypes/qmimeprovider.cpp')
| -rw-r--r-- | src/corelib/mimetypes/qmimeprovider.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/mimetypes/qmimeprovider.cpp b/src/corelib/mimetypes/qmimeprovider.cpp index c4a8458243..aac51184a4 100644 --- a/src/corelib/mimetypes/qmimeprovider.cpp +++ b/src/corelib/mimetypes/qmimeprovider.cpp @@ -502,7 +502,7 @@ void QMimeBinaryProvider::loadMimeTypePrivate(QMimeTypePrivate &data) QString lang = xml.attributes().value(QLatin1String("xml:lang")).toString(); const QString text = xml.readElementText(); if (lang.isEmpty()) { - lang = QLatin1String("en_US"); + lang = QLatin1String("default"); // no locale attribute provided, treat it as default. } data.localeComments.insert(lang, text); continue; // we called readElementText, so we're at the EndElement already. |