feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
Conflicts:
	src/plugins/projectexplorer/projectnodes.h

Change-Id: I10a749cca38c2d0929cf4d2b74ab089e14b6157b
This commit is contained in:
Eike Ziller
2019-10-02 07:32:57 +02:00
parent 93e725c17c 312ff692b0
commit ac014e3875
19 changed files with 85 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -257,7 +257,14 @@ FolderNode::AddNewInformation QmakePriFileNode::addNewInformation(const QStringL
QmakeProFileNode::QmakeProFileNode(QmakeProject *project, const FilePath &filePath, QmakeProFile *pf) :
QmakePriFileNode(project, this, filePath, pf)
{
setIsProduct();
if (projectType() == ProjectType::ApplicationTemplate) {
setProductType(ProductType::App);
} else if (projectType() == ProjectType::SharedLibraryTemplate
|| projectType() == ProjectType::StaticLibraryTemplate) {
setProductType(ProductType::Lib);
} else if (projectType() != ProjectType::SubDirsTemplate) {
setProductType(ProductType::Other);
}
}
bool QmakeProFileNode::showInSimpleTree() const