diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-08-15 10:07:51 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-08-15 10:07:51 +0200 |
| commit | d8fd5292f17bd07d390500f5daa10b46d5573a49 (patch) | |
| tree | 24a004a722d7947bd6a354e20a5ad6b651c73073 /src/plugins/projectexplorer/projectmodels.h | |
| parent | e6a50fd44a68ccb61a852c4576817162a465c2ce (diff) | |
| parent | 885f8b53858b5c6158a0c6f2208c24cc042b9f38 (diff) | |
Merge remote-tracking branch 'origin/4.4'
Conflicts:
src/tools/clangbackend/ipcsource/clangiasyncjob.cpp
src/tools/clangbackend/ipcsource/clangjobrequest.cpp
src/tools/clangbackend/ipcsource/clangjobrequest.h
Change-Id: Ib8602530663813ade418f995dfd2a736908cfe75
Diffstat (limited to 'src/plugins/projectexplorer/projectmodels.h')
| -rw-r--r-- | src/plugins/projectexplorer/projectmodels.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/projectmodels.h b/src/plugins/projectexplorer/projectmodels.h index e64bbd7102..80fdbbc36d 100644 --- a/src/plugins/projectexplorer/projectmodels.h +++ b/src/plugins/projectexplorer/projectmodels.h @@ -76,6 +76,7 @@ public: bool generatedFilesFilterEnabled(); void setProjectFilterEnabled(bool filter); void setGeneratedFilesFilterEnabled(bool filter); + void setTrimEmptyDirectories(bool filter); void onExpanded(const QModelIndex &idx); void onCollapsed(const QModelIndex &idx); @@ -87,12 +88,14 @@ signals: private: bool m_filterProjects = false; bool m_filterGeneratedFiles = true; + bool m_trimEmptyDirectories = true; static const QLoggingCategory &logger(); void updateSubtree(FolderNode *node); void rebuildModel(); void addFolderNode(WrapperNode *parent, FolderNode *folderNode, QSet<Node *> *seen); + bool trimEmptyDirectories(WrapperNode *parent); ExpandData expandDataForNode(const Node *node) const; void loadExpandData(); |