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

Remove QResourceGlobalData::resourceSearchPaths

Browse Source 
The means to add entries to this QStringList were deprecated in 5.13
and removed in Qt 6, so the list is always empty and the one place
that still references it only needs to check the empty path it adds to
the list.

Change-Id: Ie1b3f13b33c04458bd03a4a1e3db0e33a76e89f6
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
(cherry picked from commit 21cb05bef7e852480975b92026e196c3fbf24228)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Edward Welbourne 2022-06-13 11:37:31 +02:00 committed by Qt Cherry-pick Bot
parent 5a1039c1c9
commit dc7efa92ad
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/corelib/io/qresource.cpp
View File

@ -167,7 +167,6 @@ struct QResourceGlobalData
{
QRecursiveMutex resourceMutex;
ResourceList resourceList;
QStringList resourceSearchPaths;
};
Q_GLOBAL_STATIC(QResourceGlobalData, resourceGlobalData)
@ -177,9 +176,6 @@ static inline QRecursiveMutex &resourceMutex()
static inline ResourceList *resourceList()
{ return &resourceGlobalData->resourceList; }
static inline QStringList *resourceSearchPaths()
{ return &resourceGlobalData->resourceSearchPaths; }
/*!
\class QResource
\inmodule QtCore
@ -360,16 +356,10 @@ void QResourcePrivate::ensureInitialized() const
if (path.startsWith(u'/')) {
that->load(path.toString());
} else {
const auto locker = qt_scoped_lock(resourceMutex());
QStringList searchPaths = *resourceSearchPaths();
searchPaths << ""_L1;
for (int i = 0; i < searchPaths.size(); ++i) {
const QString searchPath(searchPaths.at(i) + u'/' + path);
if (that->load(searchPath)) {
that->absoluteFilePath = u':' + searchPath;
break;
}
}
// Should we search QDir::searchPath() before falling back to root ?
const QString searchPath(u'/' + path);
if (that->load(searchPath))
that->absoluteFilePath = u':' + searchPath;
}
}