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

Don't expand qrc items recursively

Browse Source 
This fixes the recursive expansion of e.g.
"qtbase/tests/auto/corelib/io/qfile/copy-fallback.qrc"
which includes itself.

Change-Id: Ib345a2d6de4fa2eefd76eed58b99a72fcb8c84b5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2021-10-20 12:13:37 +02:00
parent 2948d282ce
commit ac96f0fa06
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/resourceeditor/resourceeditorplugin.cpp
View File

@@ -255,6 +255,8 @@ void ResourceEditorPlugin::extensionsInitialized()
folder->forEachNode([&toReplace](FileNode *fn) { folder->forEachNode([&toReplace](FileNode *fn) {
if (fn->fileType() == FileType::Resource) if (fn->fileType() == FileType::Resource)
toReplace.append(fn); toReplace.append(fn);
}, {}, [](const FolderNode *fn) {
return dynamic_cast<const ResourceTopLevelNode *>(fn) == nullptr;
}); });
for (FileNode *file : qAsConst(toReplace)) { for (FileNode *file : qAsConst(toReplace)) {
FolderNode *const pn = file->parentFolderNode(); FolderNode *const pn = file->parentFolderNode();