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

Qmake: Show real effective make call on Make step - take 2

Browse Source 
Include custom Makefile.

Change-Id: Ibc6a341590f8b1ff0da2fa87f5e5bcd75182b6a7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Orgad Shaneh
2019-10-07 12:08:48 +03:00
committed by Orgad Shaneh
parent 92c067ba36
commit d26140e7f1
7 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -443,8 +443,9 @@ void QMakeStep::setSeparateDebugInfo(bool enable)
FilePath QMakeStep::makeCommand() const
{
auto ms = stepList()->firstOfType<MakeStep>();
return ms ? ms->effectiveMakeCommand().executable() : FilePath();
if (auto ms = stepList()->firstOfType<MakeStep>())
return ms->makeExecutable();
return FilePath();
}
QString QMakeStep::makeArguments(const QString &makefile) const