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/qmimetype.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/qmimetype.cpp')
| -rw-r--r-- | src/corelib/mimetypes/qmimetype.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/mimetypes/qmimetype.cpp b/src/corelib/mimetypes/qmimetype.cpp index 50b8eae5c3..55c7de0c87 100644 --- a/src/corelib/mimetypes/qmimetype.cpp +++ b/src/corelib/mimetypes/qmimetype.cpp @@ -258,6 +258,7 @@ QString QMimeType::comment() const QStringList languageList; languageList << QLocale().name(); languageList << QLocale().uiLanguages(); + languageList << QLatin1String("default"); // use the default locale if possible. for (const QString &language : qAsConst(languageList)) { const QString lang = language == QLatin1String("C") ? QLatin1String("en_US") : language; const QString comm = d->localeComments.value(lang); |