From 162f9f59d778697357e2aae80706fc920787abcf Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Thu, 5 Oct 2023 18:44:00 +0200 Subject: [PATCH] CMakePM: print newline before the message This way we'll get: [cmake] [cmake] Elapsed time: 00:05. And not the other way around. Change-Id: Ica7352cd112b9017c8a39b98618be69494527be9 Reviewed-by: Alessandro Portale --- src/plugins/cmakeprojectmanager/cmakeprocess.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp index 88cc88bd8ae..57ff1df2d2c 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp @@ -61,7 +61,7 @@ void CMakeProcess::run(const BuildDirParameters ¶meters, const QStringList & const QString msg = ::CMakeProjectManager::Tr::tr( "The source directory %1 is not reachable by the CMake executable %2.") .arg(parameters.sourceDirectory.displayName()).arg(cmakeExecutable.displayName()); - BuildSystem::appendBuildSystemOutput(addCMakePrefix({msg, QString()}).join('\n')); + BuildSystem::appendBuildSystemOutput(addCMakePrefix({QString(), msg}).join('\n')); emit finished(failedToStartExitCode); return; } @@ -70,7 +70,7 @@ void CMakeProcess::run(const BuildDirParameters ¶meters, const QStringList & const QString msg = ::CMakeProjectManager::Tr::tr( "The build directory %1 is not reachable by the CMake executable %2.") .arg(parameters.buildDirectory.displayName()).arg(cmakeExecutable.displayName()); - BuildSystem::appendBuildSystemOutput(addCMakePrefix({msg, QString()}).join('\n')); + BuildSystem::appendBuildSystemOutput(addCMakePrefix({QString(), msg}).join('\n')); emit finished(failedToStartExitCode); return; } @@ -81,7 +81,7 @@ void CMakeProcess::run(const BuildDirParameters ¶meters, const QStringList & if (!buildDirectory.exists()) { const QString msg = ::CMakeProjectManager::Tr::tr( "The build directory \"%1\" does not exist").arg(buildDirectory.toUserOutput()); - BuildSystem::appendBuildSystemOutput(addCMakePrefix({msg, QString()}).join('\n')); + BuildSystem::appendBuildSystemOutput(addCMakePrefix({QString(), msg}).join('\n')); emit finished(failedToStartExitCode); return; } @@ -91,7 +91,7 @@ void CMakeProcess::run(const BuildDirParameters ¶meters, const QStringList & const QString msg = ::CMakeProjectManager::Tr::tr( "CMake executable \"%1\" and build directory \"%2\" must be on the same device.") .arg(cmake->cmakeExecutable().toUserOutput(), buildDirectory.toUserOutput()); - BuildSystem::appendBuildSystemOutput(addCMakePrefix({msg, QString()}).join('\n')); + BuildSystem::appendBuildSystemOutput(addCMakePrefix({QString(), msg}).join('\n')); emit finished(failedToStartExitCode); return; } @@ -174,14 +174,14 @@ void CMakeProcess::handleProcessDone(const Utils::ProcessResultData &resultData) } if (!msg.isEmpty()) { - BuildSystem::appendBuildSystemOutput(addCMakePrefix({msg, QString()}).join('\n')); + BuildSystem::appendBuildSystemOutput(addCMakePrefix({QString(), msg}).join('\n')); TaskHub::addTask(BuildSystemTask(Task::Error, msg)); } emit finished(code); const QString elapsedTime = Utils::formatElapsedTime(m_elapsed.elapsed()); - BuildSystem::appendBuildSystemOutput(addCMakePrefix({elapsedTime, QString()}).join('\n')); + BuildSystem::appendBuildSystemOutput(addCMakePrefix({QString(), elapsedTime}).join('\n')); } QString addCMakePrefix(const QString &str)