diff options
| author | David Faure <david.faure@kdab.com> | 2016-08-16 13:40:09 +0200 |
|---|---|---|
| committer | David Faure <david.faure@kdab.com> | 2016-08-24 20:30:13 +0000 |
| commit | 3e453abc7d27066d444545ddbf9b4d7576dc7efb (patch) | |
| tree | e9c412fcb77f9ad6fc5e9f2ace72d718f60868a3 /src/corelib/mimetypes/qmimeprovider.cpp | |
| parent | 35b871b2b67815a320e48c6beef45ce01326f097 (diff) | |
QMimeType: use default locale rather than system locale
This makes it possible for the application to control which language
is used by QMimeType::comment()
[ChangeLog][QtCore][QMimeType] QMimeType::comment() now uses the default locale
rather than system locale, so that applications can control which language
is being used.
Task-number: QTBUG-50776
Change-Id: I82623b7c488035a4164fadaf37ebcc79a9fd6173
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
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 0c64db4d48..fbd14e2d5d 100644 --- a/src/corelib/mimetypes/qmimeprovider.cpp +++ b/src/corelib/mimetypes/qmimeprovider.cpp @@ -576,7 +576,7 @@ void QMimeBinaryProvider::loadMimeTypePrivate(QMimeTypePrivate &data) QString comment; QString mainPattern; - const QString preferredLanguage = QLocale::system().name(); + const QString preferredLanguage = QLocale().name(); for (QStringList::const_reverse_iterator it = mimeFiles.crbegin(), end = mimeFiles.crend(); it != end; ++it) { // global first, then local. QFile qfile(*it); |