Fix the error when the last module candidate is not a module

Previously, if the last module candidate was not a module item, the
value of triedToLoadModule was set to 'false'. However, we could try to
load the one of the previous candidates which means that
triedToLoadModule should be set to 'true'

Change-Id: I03278d51804568ebbd4dee93313c16517fd774e9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index 7f794a42a..f55dbd7e9 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -3120,15 +3120,16 @@ Item *ModuleLoader::searchAndLoadModuleFile(ProductContext *productContext,
         QStringList &moduleFileNames = getModuleFileNames(dirPath);
         for (auto it = moduleFileNames.begin(); it != moduleFileNames.end(); ) {
             const QString &filePath = *it;
-            triedToLoadModule = true;
+            bool triedToLoad = true;
             Item *module = loadModuleFile(productContext, fullName, isBaseModule(moduleName),
-                                          filePath, &triedToLoadModule, moduleInstance);
+                                          filePath, &triedToLoad, moduleInstance);
             if (module)
                 candidates.emplace_back(module, 0, i);
-            if (!triedToLoadModule)
+            if (!triedToLoad)
                 it = moduleFileNames.erase(it);
             else
                 ++it;
+            triedToLoadModule = triedToLoadModule || triedToLoad;
         }
     }