From a64020c4625cf4e46c06adb59943c18f702b944c Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Thu, 10 Feb 2011 15:24:49 +0100
Subject: [PATCH] DebuggingHelpers: Improve log
---
src/libs/utils/buildablehelperlibrary.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp
index ae1e9042803..3bc6b6e4497 100644
--- a/src/libs/utils/buildablehelperlibrary.cpp
+++ b/src/libs/utils/buildablehelperlibrary.cpp
@@ -266,7 +266,7 @@ bool BuildableHelperLibrary::buildHelper(const QString &helperName, const QStrin
proc.setProcessChannelMode(QProcess::MergedChannels);
output->append(QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary",
- "Building helper library '%1' in %2\n").arg(helperName, directory));
+ "Building helper '%1' in %2\n").arg(helperName, directory));
output->append(newline);
const QString makeFullPath = env.searchInPath(makeCommand);
@@ -282,9 +282,6 @@ bool BuildableHelperLibrary::buildHelper(const QString &helperName, const QStrin
if (!runBuildProcess(proc, makeFullPath, QStringList(cleanTarget), 30000, true, output, errorMessage))
return false;
}
- output->append(newline);
- output->append(QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary", "Running %1 ...\n").arg(qmakeCommand));
-
QStringList qmakeArgs;
if (!targetMode.isEmpty())
qmakeArgs << targetMode;
@@ -292,6 +289,11 @@ bool BuildableHelperLibrary::buildHelper(const QString &helperName, const QStrin
qmakeArgs << QLatin1String("-spec") << mkspec;
qmakeArgs << proFilename;
qmakeArgs << qmakeArguments;
+
+ output->append(newline);
+ output->append(QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary", "Running %1 %2 ...\n").arg(qmakeCommand,
+ qmakeArgs.join(" ")));
+
if (!runBuildProcess(proc, qmakeCommand, qmakeArgs, 30000, false, output, errorMessage))
return false;
output->append(newline);
--
GitLab