aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2021-10-04 14:13:05 +0300
committerIvan Komissarov <ABBAPOH@gmail.com>2021-10-05 09:20:25 +0000
commit042753fb25be4080258601e196eb2496e62409b2 (patch)
treea27d34f53640e59bd1ddd72976f8ab5939b62087
parent5cff551ade30b75fe97b2080d3c3a29ce1bcb928 (diff)
Micro optimization
No need to allocate a string we don't use when getting value from cache Change-Id: I5a0a47998004e42fe159789f6248559968e36139 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--src/lib/corelib/language/moduleloader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index 4d8c9076f..f8e8fb36a 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -3757,14 +3757,14 @@ Item *ModuleLoader::wrapInProjectIfNecessary(Item *item)
QString ModuleLoader::findExistingModulePath(const QString &searchPath,
const QualifiedId &moduleName)
{
- QString dirPath = searchPath + QStringLiteral("/modules");
-
// isFileCaseCorrect is a very expensive call on macOS, so we cache the value for the
// modules and search paths we've already processed
auto &moduleInfo = m_existingModulePathCache[{searchPath, moduleName}];
if (moduleInfo)
return *moduleInfo;
+ QString dirPath = searchPath + QStringLiteral("/modules");
+
for (const QString &moduleNamePart : moduleName) {
dirPath = FileInfo::resolvePath(dirPath, moduleNamePart);
if (!FileInfo::exists(dirPath) || !FileInfo::isFileCaseCorrect(dirPath)) {