diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-08-23 12:12:41 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-08-23 12:12:41 +0200 |
| commit | ddd9e96afaf77d81a7863ac78bff2657e0cf52b5 (patch) | |
| tree | 7f591a4ef724709917895b3a48022fa4fa403d33 /src/plugins/resourceeditor | |
| parent | f2d2a6c6ffbb65c413805ec4e1d3013e82dade17 (diff) | |
| parent | 7ef365d756f49ac28bf7a4d93009fa9626dc3f2d (diff) | |
Merge remote-tracking branch 'origin/4.4'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/libs/utils/utils-lib.pri
src/plugins/clangcodemodel/clangbackendipcintegration.h
src/shared/qbs
Change-Id: I240e89afc76d8f40ce69d66683014b603f714707
Diffstat (limited to 'src/plugins/resourceeditor')
| -rw-r--r-- | src/plugins/resourceeditor/resourcenode.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/resourceeditor/resourcenode.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp index 48bdac0a9b..4fa45e2184 100644 --- a/src/plugins/resourceeditor/resourcenode.cpp +++ b/src/plugins/resourceeditor/resourcenode.cpp @@ -492,6 +492,11 @@ bool ResourceTopLevelNode::showInSimpleTree() const return true; } +bool ResourceTopLevelNode::showWhenEmpty() const +{ + return true; +} + ResourceFolderNode::ResourceFolderNode(const QString &prefix, const QString &lang, ResourceTopLevelNode *parent) : FolderNode(FileName(parent->filePath()).appendPath(prefix)), // TOOD Why add existing directory doesn't work diff --git a/src/plugins/resourceeditor/resourcenode.h b/src/plugins/resourceeditor/resourcenode.h index 02cb296805..6752eb6855 100644 --- a/src/plugins/resourceeditor/resourcenode.h +++ b/src/plugins/resourceeditor/resourcenode.h @@ -51,6 +51,7 @@ public: AddNewInformation addNewInformation(const QStringList &files, Node *context) const override; bool showInSimpleTree() const override; + bool showWhenEmpty() const override; bool removeNonExistingFiles(); QString contents() const { return m_contents; } |