diff options
author | con <qtc-committer@nokia.com> | 2009-02-17 12:59:58 +0100 |
---|---|---|
committer | con <qtc-committer@nokia.com> | 2009-02-17 12:59:58 +0100 |
commit | c05e9347bb349b265c61cb38f0c4382363dc91b4 (patch) | |
tree | 4ffb28262f3ca2a7d8b1bea9042a7418e13153f4 /src | |
parent | 6edae34a54df4acc38c035aa516798a3e6ed805c (diff) | |
download | qt-creator-c05e9347bb349b265c61cb38f0c4382363dc91b4.tar.gz |
Fixes: - Make sure that we find make command for gdbmacros library.
Task: - 244273
Details: - We need to search in the path for it.
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp b/src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp index 507c059239..6e2ccbc250 100644 --- a/src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp +++ b/src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp @@ -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); |