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
2017-08-23 12:12:41 +02:00
parent f2d2a6c6ff 7ef365d756
commit ddd9e96afa
70 changed files with 495 additions and 707 deletions
--- a/src/plugins/projectexplorer/projectnodes.cpp
+++ b/src/plugins/projectexplorer/projectnodes.cpp
@@ -740,6 +740,11 @@ bool FolderNode::showInSimpleTree() const
    return false;
 }

+bool FolderNode::showWhenEmpty() const
+{
+    return false;
+}
+
 /*!
  \class ProjectExplorer::VirtualFolderNode