1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix default of SettingsPath when qt.conf is present

Browse Source 
it's documented to fall back to Prefix if qt.conf is present but
Settings is not specified.

Task-number: QTBUG-44644
Change-Id: I8ef6659cbdad51b2fb3c1075ea6f0af4997117ed
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Oswald Buddenhagen 2015-02-25 12:14:52 +01:00
parent a59028d6e9
commit a659b4e56b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/global/qlibraryinfo.cpp
View File

@ -441,8 +441,10 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group)
defaultValue = QLatin1String(qtConfEntries[loc].value); defaultValue = QLatin1String(qtConfEntries[loc].value);
} }
#ifndef Q_OS_WIN // On Windows we use the registry #ifndef Q_OS_WIN // On Windows we use the registry
else if (loc == SettingsPath) else if (loc == SettingsPath) {
key = QLatin1String("Settings"); key = QLatin1String("Settings");
defaultValue = QLatin1String(".");
}
#endif #endif
if(!key.isNull()) { if(!key.isNull()) {