From ac96f0fa061b4e47173d490a339565caa94238c1 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 20 Oct 2021 12:13:37 +0200 Subject: [PATCH] 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 --- src/plugins/resourceeditor/resourceeditorplugin.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp index f901a417dff..36de99ca394 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(fn) == nullptr; }); for (FileNode *file : qAsConst(toReplace)) { FolderNode *const pn = file->parentFolderNode();