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

DebuggingHelpers: Improve log

Browse Source
This commit is contained in:
Kai Koehne
2011-02-10 15:24:49 +01:00
parent 3fef120d59
commit a64020c462
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/utils/buildablehelperlibrary.cpp
View File

@@ -266,7 +266,7 @@ bool BuildableHelperLibrary::buildHelper(const QString &helperName, const QStrin
proc.setProcessChannelMode(QProcess::MergedChannels); proc.setProcessChannelMode(QProcess::MergedChannels);
output->append(QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary", 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); output->append(newline);
const QString makeFullPath = env.searchInPath(makeCommand); 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)) if (!runBuildProcess(proc, makeFullPath, QStringList(cleanTarget), 30000, true, output, errorMessage))
return false; return false;
} }
output->append(newline);
output->append(QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary", "Running %1 ...\n").arg(qmakeCommand));
QStringList qmakeArgs; QStringList qmakeArgs;
if (!targetMode.isEmpty()) if (!targetMode.isEmpty())
qmakeArgs << targetMode; qmakeArgs << targetMode;
@@ -292,6 +289,11 @@ bool BuildableHelperLibrary::buildHelper(const QString &helperName, const QStrin
qmakeArgs << QLatin1String("-spec") << mkspec; qmakeArgs << QLatin1String("-spec") << mkspec;
qmakeArgs << proFilename; qmakeArgs << proFilename;
qmakeArgs << qmakeArguments; 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)) if (!runBuildProcess(proc, qmakeCommand, qmakeArgs, 30000, false, output, errorMessage))
return false; return false;
output->append(newline); output->append(newline);