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

Revert "Revert "Designer: Fix look-up of resources for UI files""

Browse Source 
This reverts commit d907df0349.
The original change was pushed to 4.10 and reverted there for
binary compatibility reasons. Revert the revert here.

 Conflicts:
	src/plugins/projectexplorer/projectnodes.h

Change-Id: Ibfd84a30a6cfdd78e1fa1b1c61785d391a5a18be
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Eike Ziller
2019-10-04 12:22:47 +02:00
parent 77cf25751e
commit a0f3ce69bd
5 changed files with 45 additions and 17 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