summaryrefslogtreecommitdiff
path: root/src/plugins/qmakeprojectmanager/qmakenodes.h
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2017-11-02 10:20:44 +0100
committerEike Ziller <eike.ziller@qt.io>2017-11-02 09:45:25 +0000
commitaab634ff151fa1b3d2f29812a4af2285213921ae (patch)
tree735c7f0cdd70c211d89752a7c84e6b2690bedc6f /src/plugins/qmakeprojectmanager/qmakenodes.h
parentbacfc28a36eb858b65e9786061f68f145d4fd5f6 (diff)
downloadqt-creator-aab634ff151fa1b3d2f29812a4af2285213921ae.tar.gz
Revert "Qmake: Make finding pro-files fast"
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 21b0e7c37e8f04dfc763852089174b51d5675a1c. Change-Id: I471c9963bd739b74e48286e1bde00f7222b90c8b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakenodes.h')
-rw-r--r--src/plugins/qmakeprojectmanager/qmakenodes.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.h b/src/plugins/qmakeprojectmanager/qmakenodes.h
index 56a2b6be62..aca17e18a2 100644
--- a/src/plugins/qmakeprojectmanager/qmakenodes.h
+++ b/src/plugins/qmakeprojectmanager/qmakenodes.h
@@ -42,7 +42,7 @@ class QMAKEPROJECTMANAGER_EXPORT QmakePriFileNode : public ProjectExplorer::Proj
{
public:
QmakePriFileNode(QmakeProject *project, QmakeProFileNode *qmakeProFileNode,
- const Utils::FileName &filePath, QmakePriFile *pf);
+ const Utils::FileName &filePath);
QmakePriFile *priFile() const;
@@ -73,14 +73,13 @@ protected:
private:
QmakeProFileNode *m_qmakeProFileNode = nullptr;
- QmakePriFile *m_qmakePriFile = nullptr;
};
// Implements ProjectNode for qmake .pro files
class QMAKEPROJECTMANAGER_EXPORT QmakeProFileNode : public QmakePriFileNode
{
public:
- QmakeProFileNode(QmakeProject *project, const Utils::FileName &filePath, QmakeProFile *pf);
+ QmakeProFileNode(QmakeProject *project, const Utils::FileName &filePath);
QmakeProFile *proFile() const;