diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-06-24 08:49:00 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-06-24 10:43:10 +0200 |
| commit | 6bc9cddb9e52111bad40fc2f3d3ad20773b211d2 (patch) | |
| tree | 10330e6097ca490dffc2e08cd381daaf0e6403d1 /src/plugins/resourceeditor | |
| parent | dda115d0d8ad73de3b26fe94d5aca45a02818209 (diff) | |
| parent | afa421887165fc33b100a00ae6908952dc102945 (diff) | |
| download | qt-creator-6bc9cddb9e52111bad40fc2f3d3ad20773b211d2.tar.gz | |
Merge remote-tracking branch 'origin/4.15' into 5.0
Conflicts:
src/plugins/cmakeprojectmanager/projecttreehelper.cpp
src/plugins/coreplugin/mainwindow.cpp
Change-Id: Ie3a281b8635e79ca5fa794a127ed0039f33fe2ee
Diffstat (limited to 'src/plugins/resourceeditor')
| -rw-r--r-- | src/plugins/resourceeditor/resourceeditorplugin.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp index 50708c98c1..25c29e2cdc 100644 --- a/src/plugins/resourceeditor/resourceeditorplugin.cpp +++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp @@ -258,6 +258,7 @@ void ResourceEditorPlugin::extensionsInitialized() QTC_ASSERT(pn, continue); const Utils::FilePath path = file->filePath(); auto topLevel = std::make_unique<ResourceTopLevelNode>(path, pn->filePath()); + topLevel->setEnabled(file->isEnabled()); topLevel->setIsGenerated(file->isGenerated()); pn->replaceSubtree(file, std::move(topLevel)); } |