summaryrefslogtreecommitdiff
path: root/src/plugins/resourceeditor
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2017-01-30 14:26:44 +0100
committerhjk <hjk@qt.io>2017-01-30 13:43:31 +0000
commitcbfedd4328e156bd5cdc0d5604309b89945d9caf (patch)
tree8af6f473f05d2e03ad3714a9b829bf83fdbffb7f /src/plugins/resourceeditor
parente8b4e180cd0eb3752116284415b327f0946be833 (diff)
downloadqt-creator-cbfedd4328e156bd5cdc0d5604309b89945d9caf.tar.gz
ProjectExplorer: Fix display of .qrc contents
Change-Id: I2779e12daa8a7972380f51b72a56de3466d453a5 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/resourceeditor')
-rw-r--r--src/plugins/resourceeditor/resourcenode.cpp5
-rw-r--r--src/plugins/resourceeditor/resourcenode.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp
index 7bcc2d6c0f..dad9bad023 100644
--- a/src/plugins/resourceeditor/resourcenode.cpp
+++ b/src/plugins/resourceeditor/resourcenode.cpp
@@ -119,7 +119,7 @@ ResourceTopLevelNode::~ResourceTopLevelNode()
delete m_document;
}
-void ResourceTopLevelNode::update()
+void ResourceTopLevelNode::addInternalNodes()
{
QMap<PrefixFolderLang, QList<ProjectExplorer::FileNode *>> filesToAdd;
QMap<PrefixFolderLang, QList<ProjectExplorer::FolderNode *>> foldersToAddToFolders;
@@ -518,7 +518,8 @@ bool ResourceFileWatcher::reload(QString *errorString, ReloadFlag flag, ChangeTy
Q_UNUSED(flag)
if (type == TypePermissions)
return true;
- m_node->update();
+ m_node->makeEmpty();
+ m_node->addInternalNodes();
return true;
}
diff --git a/src/plugins/resourceeditor/resourcenode.h b/src/plugins/resourceeditor/resourcenode.h
index 1ea628e393..770b7edeb3 100644
--- a/src/plugins/resourceeditor/resourcenode.h
+++ b/src/plugins/resourceeditor/resourcenode.h
@@ -41,7 +41,7 @@ class RESOURCE_EXPORT ResourceTopLevelNode : public ProjectExplorer::FolderNode
public:
ResourceTopLevelNode(const Utils::FileName &filePath, const QString &contents, FolderNode *parent);
~ResourceTopLevelNode() override;
- void update();
+ void addInternalNodes();
QString addFileFilter() const override;