Merge remote-tracking branch 'origin/3.1'

Conflicts:
	qbs/imports/QtcTool.qbs
	src/plugins/git/giteditor.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0

src/plugins/qmlprojectmanager/qmlprojectmanager.qbs

@@ -1,4 +1,4 @@
-import qbs.base 1.0
+import qbs 1.0
 
 import QtcPlugin
 

src/plugins/qmlprojectmanager/qmlprojectnodes.cpp

@@ -164,7 +164,7 @@ ProjectExplorer::FolderNode *QmlProjectNode::findOrCreateFolderByName(const QStr
     return findOrCreateFolderByName(components, components.length());
 }
 
-bool QmlProjectNode::hasBuildTargets() const
+bool QmlProjectNode::showInSimpleTree() const
 {
     return true;
 }

src/plugins/qmlprojectmanager/qmlprojectnodes.h

@@ -52,7 +52,7 @@ public:
     Core::IDocument *projectFile() const;
     QString projectFilePath() const;
 
-    virtual bool hasBuildTargets() const;
+    virtual bool showInSimpleTree() const;
 
     virtual QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const;