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

qmake: move over from QmakeProjectNodes to QmakeParserNodes

Browse Source 
Change-Id: Iab87e0c248b0f651a1774336c3bddf83baa9d057
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-02-10 11:16:18 +01:00
committed by Tim Jenssen
parent 62726c3f77
commit f9eab73dad
32 changed files with 440 additions and 2775 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -224,8 +224,9 @@ bool QMakeStep::init(QList<const BuildStep *> &earlierSteps)
QString makefile = workingDirectory;
if (qmakeBc->subNodeBuild()) {
if (!qmakeBc->subNodeBuild()->makefile().isEmpty())
makefile.append(qmakeBc->subNodeBuild()->makefile());
QmakeProFile *pro = qmakeBc->subNodeBuild()->proFile();
if (pro && !pro->makefile().isEmpty())
makefile.append(pro->makefile());
else
makefile.append(QLatin1String("/Makefile"));
} else if (!qmakeBc->makefile().isEmpty()) {