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

Revert "Qmake: Make finding pro-files fast"

Browse Source 
The patch broke defining the correct executable for qmake based
projects. Loading more complex projects (like QC itself) did
end up failing to run any executable out of the box as the
executable name was always wrong.
This reverts commit 21b0e7c37e.

Change-Id: I471c9963bd739b74e48286e1bde00f7222b90c8b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Stenger
2017-11-02 10:20:44 +01:00
committed by Eike Ziller
parent bacfc28a36
commit aab634ff15
5 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,21 +44,20 @@ namespace QmakeProjectManager {
*/
QmakePriFileNode::QmakePriFileNode(QmakeProject *project, QmakeProFileNode *qmakeProFileNode,
const FileName &filePath, QmakePriFile *pf) :
const FileName &filePath) :
ProjectNode(filePath),
m_project(project),
m_qmakeProFileNode(qmakeProFileNode),
m_qmakePriFile(pf)
m_qmakeProFileNode(qmakeProFileNode)
{ }
QmakePriFile *QmakePriFileNode::priFile() const
{
return m_qmakePriFile;
return m_project->rootProFile()->findPriFile(filePath());
}
bool QmakePriFileNode::deploysFolder(const QString &folder) const
{
const QmakePriFile *pri = priFile();
QmakePriFile *pri = priFile();
return pri ? pri->deploysFolder(folder) : false;
}
@@ -146,7 +145,7 @@ bool QmakePriFileNode::supportsAction(ProjectAction action, const Node *node) co
bool QmakePriFileNode::canAddSubProject(const QString &proFilePath) const
{
const QmakePriFile *pri = priFile();
QmakePriFile *pri = priFile();
return pri ? pri->canAddSubProject(proFilePath) : false;
}
@@ -214,8 +213,8 @@ QmakeProFileNode *QmakeProFileNode::findProFileFor(const FileName &fileName) con
\class QmakeProFileNode
Implements abstract ProjectNode class
*/
QmakeProFileNode::QmakeProFileNode(QmakeProject *project, const FileName &filePath, QmakeProFile *pf) :
QmakePriFileNode(project, this, filePath, pf)
QmakeProFileNode::QmakeProFileNode(QmakeProject *project, const FileName &filePath) :
QmakePriFileNode(project, this, filePath)
{ }
bool QmakeProFileNode::showInSimpleTree() const
@@ -225,7 +224,7 @@ bool QmakeProFileNode::showInSimpleTree() const
QmakeProFile *QmakeProFileNode::proFile() const
{
return static_cast<QmakeProFile*>(QmakePriFileNode::priFile());
return m_project->rootProFile()->findProFile(filePath());
}
FolderNode::AddNewInformation QmakeProFileNode::addNewInformation(const QStringList &files, Node *context) const