From c05e9347bb349b265c61cb38f0c4382363dc91b4 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Tue, 17 Feb 2009 12:59:58 +0100
Subject: [PATCH] Fixes: - Make sure that we find make command for gdbmacros
library.
Task: - 244273
Details: - We need to search in the path for it.
---
src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp b/src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp
index 507c059239e..6e2ccbc2506 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);
--
GitLab