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

Android: Adding libraries to subdirs projects

Browse Source 
Task-number: QTCREATORBUG-11625

Change-Id: I1017546463e819fc05846af74582cb9f5739ff08
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2015-02-18 16:01:58 +01:00
parent 3cd9bbb550
commit 4dc36974a8
5 changed files with 67 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1527,13 +1527,13 @@ namespace {
};
}
const QmakeProFileNode *QmakeProFileNode::findProFileFor(const FileName &fileName) const
QmakeProFileNode *QmakeProFileNode::findProFileFor(const FileName &fileName) const
{
if (fileName == path())
return this;
return const_cast<QmakeProFileNode *>(this);
foreach (ProjectNode *pn, subProjectNodes())
if (QmakeProFileNode *qmakeProFileNode = dynamic_cast<QmakeProFileNode *>(pn))
if (const QmakeProFileNode *result = qmakeProFileNode->findProFileFor(fileName))
if (QmakeProFileNode *result = qmakeProFileNode->findProFileFor(fileName))
return result;
return 0;
}