From dc7efa92ade49ba4eb7b368d5e611b3838abdbf1 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 13 Jun 2022 11:37:31 +0200 Subject: [PATCH] Remove QResourceGlobalData::resourceSearchPaths 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 (cherry picked from commit 21cb05bef7e852480975b92026e196c3fbf24228) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/io/qresource.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index 5bee6c675b3..3fd5a55637e 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -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; } }