Merge remote-tracking branch 'origin/4.10' into 4.11

Conflicts:
	src/plugins/projectexplorer/projectnodes.h

Change-Id: Ibd255105a01c53a1f81a1ec7b30495dfef1877a9
This commit is contained in:
Eike Ziller
2019-10-04 12:19:32 +02:00
6 changed files with 25 additions and 47 deletions

View File

@@ -174,7 +174,7 @@ CMakeTargetNode::CMakeTargetNode(const Utils::FilePath &directory, const QString
setPriority(Node::DefaultProjectPriority + 900);
setIcon(QIcon(":/projectexplorer/images/build.png")); // TODO: Use proper icon!
setListInProject(false);
setProductType(ProductType::Other);
setIsProduct();
}
QString CMakeTargetNode::tooltip() const