feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Designer: Fix possible endless loop

Browse Source 
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>
This commit is contained in:
Christian Stenger
2019-07-15 11:14:24 +02:00
parent 663e9003a3
commit 7e63ca97de
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/designer/resourcehandler.cpp
View File

@@ -106,9 +106,9 @@ void ResourceHandler::updateResourcesHelper(bool updateProjectResources)
if (fileNode) { if (fileNode) {
// We do not want qbs groups or qmake .pri files here, as they contain only a subset // We do not want qbs groups or qmake .pri files here, as they contain only a subset
// of the relevant files. // of the relevant files.
do
projectNode = fileNode->parentProjectNode(); projectNode = fileNode->parentProjectNode();
while (projectNode && !projectNode->isProduct()); while (projectNode && !projectNode->isProduct())
projectNode = projectNode->parentProjectNode();
} }
if (!projectNode) if (!projectNode)
projectNode = project->rootProjectNode(); projectNode = project->rootProjectNode();