From 7e63ca97deba1c072745a20b6d7c29b03156d1d2 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 15 Jul 2019 11:14:24 +0200 Subject: [PATCH] Designer: Fix possible endless loop Opening a ui file listed in a pri file may trigger this endless loop by returning always the same project node. Change-Id: Id1697ea77c39c4693d36fbc3fcd9600b05022e58 Reviewed-by: Christian Kandeler --- src/plugins/designer/resourcehandler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/designer/resourcehandler.cpp b/src/plugins/designer/resourcehandler.cpp index 0f7029a0e23..84020f77ee4 100644 --- a/src/plugins/designer/resourcehandler.cpp +++ b/src/plugins/designer/resourcehandler.cpp @@ -106,9 +106,9 @@ void ResourceHandler::updateResourcesHelper(bool updateProjectResources) if (fileNode) { // We do not want qbs groups or qmake .pri files here, as they contain only a subset // of the relevant files. - do - projectNode = fileNode->parentProjectNode(); - while (projectNode && !projectNode->isProduct()); + projectNode = fileNode->parentProjectNode(); + while (projectNode && !projectNode->isProduct()) + projectNode = projectNode->parentProjectNode(); } if (!projectNode) projectNode = project->rootProjectNode();