AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the default QLocale for QFileSelector, not the system locale

Browse Source 
The default locale is the system locale, unless you changed the default
with QLocale::setLocale(). If you did that, you probably want it to
apply to QFileSelector too.

Task-number: QTBUG-45951
Change-Id: I0d4913955e3745b69672ffff13db5a2c7f8b1227
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
This commit is contained in:
Thiago Macieira 2015-05-05 07:34:13 -07:00
parent 36df3305f9
commit e70d4b9899
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/io/qfileselector.cpp
View File

@ -80,7 +80,7 @@ QFileSelectorPrivate::QFileSelectorPrivate()
QString defaultsBasePath = "data/"; QString defaultsBasePath = "data/";
QString defaultsPath = defaultsBasePath + "defaults.conf"; QString defaultsPath = defaultsBasePath + "defaults.conf";
QString localizedPath = defaultsBasePath QString localizedPath = defaultsBasePath
+ QString("%1/defaults.conf").arg(QLocale::system().name()); + QString("%1/defaults.conf").arg(QLocale().name());
if (QFile::exists(localizedPath)) if (QFile::exists(localizedPath))
defaultsPath = localizedPath; defaultsPath = localizedPath;
QFile defaults(defaultsPath); QFile defaults(defaultsPath);
@ -148,7 +148,7 @@ QFileSelectorPrivate::QFileSelectorPrivate()
on (list not exhaustive): android, blackberry, ios, osx, darwin, mac, linux, wince, unix, on (list not exhaustive): android, blackberry, ios, osx, darwin, mac, linux, wince, unix,
windows. On Linux, if it can be determined, the name of the distribution too, like debian, windows. On Linux, if it can be determined, the name of the distribution too, like debian,
fedora or opensuse. fedora or opensuse.
\li locale, same as QLocale::system().name(). \li locale, same as QLocale().name().
\endlist \endlist
Further selectors will be added from the \c QT_FILE_SELECTORS environment variable, which Further selectors will be added from the \c QT_FILE_SELECTORS environment variable, which
@ -347,7 +347,7 @@ void QFileSelectorPrivate::updateSelectors()
sharedData->staticSelectors << sharedData->preloadedStatics; //Potential for static selectors from other modules sharedData->staticSelectors << sharedData->preloadedStatics; //Potential for static selectors from other modules
// TODO: Update on locale changed? // TODO: Update on locale changed?
sharedData->staticSelectors << QLocale::system().name(); sharedData->staticSelectors << QLocale().name();
sharedData->staticSelectors << platformSelectors(); sharedData->staticSelectors << platformSelectors();
} }