whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QLibraryInfo: Refactor in preparation of multiple entries [2/2] 

Move the extraction of the QVariant from QSettings into a helper
function.

Change-Id: I3b6be9939e138a244626dd81dbc3535e75770bb9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Fabian Kosmale 2024-05-07 11:31:47 +02:00
parent 5cbe81dae2
commit fc4b67bb85
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -551,6 +551,28 @@ static QString normalizePath(QString ret)
return QDir::fromNativeSeparators(ret);
};
#if QT_CONFIG(settings)
static QVariant libraryPathToValue(QLibraryInfo::LibraryPath loc)
{
QVariant value;
auto li = QLibraryInfoPrivate::locationInfo(loc);
if (li.key.isNull())
return value;
QSettings *config = QLibraryInfoPrivate::configuration();
Q_ASSERT(config != nullptr);
config->beginGroup("Paths"_L1);
auto cleanup = qScopeGuard([&]() { config->endGroup(); });
if (li.fallbackKey.isNull()) {
value = config->value(li.key, li.defaultValue);
} else {
value = config->value(li.key);
if (!value.isValid())
value = config->value(li.fallbackKey, li.defaultValue);
}
return value;
}
#endif // settings
/*
Returns the path specified by \a p.
@ -566,22 +588,9 @@ QString QLibraryInfoPrivate::path(QLibraryInfo::LibraryPath p, UsageMode usageMo
if (havePaths()) {
fromConf = true;
auto li = QLibraryInfoPrivate::locationInfo(loc);
if (!li.key.isNull()) {
QSettings *config = QLibraryInfoPrivate::configuration();
Q_ASSERT(config != nullptr);
config->beginGroup("Paths"_L1);
auto cleanup = qScopeGuard([&]() { config->endGroup(); });
if (li.fallbackKey.isNull()) {
ret = config->value(li.key, li.defaultValue).toString();
} else {
QVariant v = config->value(li.key);
if (!v.isValid())
v = config->value(li.fallbackKey, li.defaultValue);
ret = v.toString();
}
QVariant value = libraryPathToValue(loc);
if (value.isValid()) {
ret = std::move(value).toString();
ret = normalizePath(std::move(ret));
}
}