diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2019-07-15 11:14:24 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2019-07-15 11:03:13 +0000 |
| commit | 7e63ca97deba1c072745a20b6d7c29b03156d1d2 (patch) | |
| tree | 180435fe990345be50e1c4b7078451fb922c9afe /src/plugins/designer | |
| parent | 663e9003a327f510c9342c82e57bb3f147a71be3 (diff) | |
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 <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/designer')
| -rw-r--r-- | src/plugins/designer/resourcehandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/designer/resourcehandler.cpp b/src/plugins/designer/resourcehandler.cpp index 0f7029a0e2..84020f77ee 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(); |