From 576e3b7acd313191a398947170ebf95a2915bc2d Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 25 Jun 2024 16:59:41 +0300 Subject: [PATCH] QmlDesigner: Fix subfolder imports Recursion for possible imports was interrupted when an incompatible folder was detected, even though that folder could have compatible subfolders. Fixes: QDS-13067 Change-Id: I61f0ac6265e922c515dcd380a481434a1ddfcc93 Reviewed-by: Mahmoud Badri --- .../qmldesigner/designercore/model/texttomodelmerger.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 73a1ea46f7b..6950aa749a2 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -806,11 +806,10 @@ void collectPossibleFileImports(const QString &checkPath, // Omit all imports that would be just "../", "../../" etc. without additional subfolder, // as we don't want to encourage bad design. "../MySharedComps" is a legitimate // use, though. - if (importName.startsWith(upDir) && importName.lastIndexOf(upDir) == importName.size() - 3) - continue; - - QmlDesigner::Import import = QmlDesigner::Import::createFileImport(importName); - possibleImports.append(import); + if (!importName.startsWith(upDir) || importName.lastIndexOf(upDir) != importName.size() - 3) { + QmlDesigner::Import import = QmlDesigner::Import::createFileImport(importName); + possibleImports.append(import); + } } collectPossibleFileImports(dirPath, docDir, usedImportsSet, possibleImports); }