aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/resourceeditor/resourceeditorplugin.cpp
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2021-10-20 12:13:37 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2021-10-20 12:35:36 +0000
commitac96f0fa061b4e47173d490a339565caa94238c1 (patch)
tree01d36dc680092c0b666189456b111820373d6fbd /src/plugins/resourceeditor/resourceeditorplugin.cpp
parent2948d282ce6518d1befd3e1d3371089a9863cac8 (diff)
Don't expand qrc items recursively
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>
Diffstat (limited to 'src/plugins/resourceeditor/resourceeditorplugin.cpp')
-rw-r--r--src/plugins/resourceeditor/resourceeditorplugin.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp
index f901a417df..36de99ca39 100644
--- a/src/plugins/resourceeditor/resourceeditorplugin.cpp
+++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp
@@ -255,6 +255,8 @@ void ResourceEditorPlugin::extensionsInitialized()
folder->forEachNode([&toReplace](FileNode *fn) {
if (fn->fileType() == FileType::Resource)
toReplace.append(fn);
+ }, {}, [](const FolderNode *fn) {
+ return dynamic_cast<const ResourceTopLevelNode *>(fn) == nullptr;
});
for (FileNode *file : qAsConst(toReplace)) {
FolderNode *const pn = file->parentFolderNode();