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

Fixes: - Make sure that we find make command for gdbmacros library.

Browse Source 
Task:     - 244273
Details:  - We need to search in the path for it.
This commit is contained in:
con
2009-02-17 12:59:58 +01:00
parent 6edae34a54
commit c05e9347bb
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp
View File

@@ -124,7 +124,15 @@ void GdbMacrosBuildStep::run(QFutureInterface<bool> & fi)
qmake.start(m_qmake, QStringList()<<"-spec"<<mkspec<<configarguments<<"gdbmacros.pro");
qmake.waitForFinished();
qmake.start(qt4Project->qtVersion(m_buildConfiguration)->makeCommand(), makeArguments);
QString makeCmd = qt4Project->qtVersion(m_buildConfiguration)->makeCommand();
if (!value(m_buildConfiguration, "makeCmd").toString().isEmpty())
makeCmd = value(m_buildConfiguration, "makeCmd").toString();
if (!QFileInfo(makeCmd).isAbsolute()) {
// Try to detect command in environment
QString tmp = qt4Project->environment(m_buildConfiguration).searchInPath(makeCmd);
makeCmd = tmp;
}
qmake.start(makeCmd, makeArguments);
qmake.waitForFinished();
fi.reportResult(true);