diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-25 14:20:33 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-08-25 16:08:09 +0000 |
commit | 13680ceb9a468f824e24e448e932eed3a4ad9007 (patch) | |
tree | 5b8441f3cfc6e2e012172795b9a83f0adc8798fc /src/corelib/mimetypes/qmimetype.cpp | |
parent | 095abb192577d61215fcf7ea3a55338c54a3c4b0 (diff) | |
parent | c7cdf3aac7ef9571ce0c0cf25a2c8455c7604451 (diff) |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/corelib/mimetypes/qmimetype.cpp')
-rw-r--r-- | src/corelib/mimetypes/qmimetype.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/mimetypes/qmimetype.cpp b/src/corelib/mimetypes/qmimetype.cpp index 80b6a76ecc..b259b42ac8 100644 --- a/src/corelib/mimetypes/qmimetype.cpp +++ b/src/corelib/mimetypes/qmimetype.cpp @@ -238,15 +238,15 @@ QString QMimeType::name() const /*! Returns the description of the MIME type to be displayed on user interfaces. - The system language (QLocale::system().name()) is used to select the appropriate translation. + The default language (QLocale().name()) is used to select the appropriate translation. */ QString QMimeType::comment() const { QMimeDatabasePrivate::instance()->provider()->loadMimeTypePrivate(*d); QStringList languageList; - languageList << QLocale::system().name(); - languageList << QLocale::system().uiLanguages(); + languageList << QLocale().name(); + languageList << QLocale().uiLanguages(); for (const QString &language : qAsConst(languageList)) { const QString lang = language == QLatin1String("C") ? QLatin1String("en_US") : language; const QString comm = d->localeComments.value(lang); |