diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-07-25 09:38:09 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-07-25 09:38:09 +0200 |
| commit | 8e376ab3403967280b3ca6bfd42b5641ce0f05bc (patch) | |
| tree | b31b1aea57155531e5b423939f96ac80d824c5c6 /src/plugins/resourceeditor/resourcenode.cpp | |
| parent | a7bf0c0ea1649fdf9bc4f4b5b312d818929b470c (diff) | |
| parent | d9e847150f0d78fad1e902d7a53e2912db39e60b (diff) | |
Merge remote-tracking branch 'origin/4.10'
Conflicts:
src/plugins/baremetal/iarewtoolchain.cpp
Change-Id: I483e81d7e920e724fb7cde84a8f6fa9bce4cd518
Diffstat (limited to 'src/plugins/resourceeditor/resourcenode.cpp')
| -rw-r--r-- | src/plugins/resourceeditor/resourcenode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp index 8444b07068..13d23eee23 100644 --- a/src/plugins/resourceeditor/resourcenode.cpp +++ b/src/plugins/resourceeditor/resourcenode.cpp @@ -234,6 +234,7 @@ ResourceTopLevelNode::ResourceTopLevelNode(const FilePath &filePath, setPriority(Node::DefaultFilePriority); setListInProject(true); setAddFileFilter("*.png; *.jpg; *.gif; *.svg; *.ico; *.qml; *.qml.ui"); + setShowWhenEmpty(true); if (!filePath.isEmpty()) { QFileInfo fi = filePath.toFileInfo(); @@ -470,7 +471,6 @@ ResourceFolderNode::ResourceFolderNode(const QString &prefix, const QString &lan m_prefix(prefix), m_lang(lang) { - setShowWhenEmpty(true); } ResourceFolderNode::~ResourceFolderNode() = default; |