From e772fbab6bb5138e3728b2f3c5a731f4b913d027 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 17 Sep 2024 16:04:38 +0200 Subject: [PATCH] ProjectExplorer: Fix some wrong output message types OutputFormat::Stderr is for output from external tools, not our own messages. Fixes: QTCREATORBUG-31544 Change-Id: I1065823fe8188d4368dc750333f7a744df85aa5f Reviewed-by: Christian Stenger --- src/plugins/projectexplorer/buildmanager.cpp | 17 ++++++++++------- .../remotelinux/tarpackagecreationstep.cpp | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index 75af8711c7f..db194b2551a 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -814,16 +814,19 @@ void BuildManager::startBuildQueue() return; const QString projectName = buildStep->project()->displayName(); const QString targetName = target->displayName(); - addToOutputWindow(Tr::tr("Error while building/deploying project %1 (kit: %2)") - .arg(projectName, targetName), BuildStep::OutputFormat::Stderr); + addToOutputWindow( + Tr::tr("Error while building/deploying project %1 (kit: %2)") + .arg(projectName, targetName), + BuildStep::OutputFormat::ErrorMessage); const Tasks kitTasks = target->kit()->validate(); if (!kitTasks.isEmpty()) { addToOutputWindow(Tr::tr("The kit %1 has configuration issues which might " "be the root cause for this problem.") - .arg(targetName), BuildStep::OutputFormat::Stderr); + .arg(targetName), BuildStep::OutputFormat::ErrorMessage); } - addToOutputWindow(Tr::tr("When executing step \"%1\"") - .arg(buildStep->displayName()), BuildStep::OutputFormat::Stderr); + addToOutputWindow( + Tr::tr("When executing step \"%1\"").arg(buildStep->displayName()), + BuildStep::OutputFormat::ErrorMessage); }; const Group recipeGroup { onGroupSetup(onRecipeSetup), @@ -919,9 +922,9 @@ bool BuildManager::buildQueueAppend(const QList &items, const QString const QString projectName = buildStep->project()->displayName(); const QString targetName = buildStep->target()->displayName(); addToOutputWindow(Tr::tr("Error while building/deploying project %1 (kit: %2)") - .arg(projectName, targetName), BuildStep::OutputFormat::Stderr); + .arg(projectName, targetName), BuildStep::OutputFormat::ErrorMessage); addToOutputWindow(Tr::tr("When executing step \"%1\"") - .arg(buildStep->displayName()), BuildStep::OutputFormat::Stderr); + .arg(buildStep->displayName()), BuildStep::OutputFormat::ErrorMessage); for (BuildStep *buildStep : std::as_const(connectedSteps)) disconnect(buildStep, nullptr, m_instance, nullptr); d->m_outputWindow->popup(IOutputPane::NoModeSwitch); diff --git a/src/plugins/remotelinux/tarpackagecreationstep.cpp b/src/plugins/remotelinux/tarpackagecreationstep.cpp index e447930913c..303175ab849 100644 --- a/src/plugins/remotelinux/tarpackagecreationstep.cpp +++ b/src/plugins/remotelinux/tarpackagecreationstep.cpp @@ -191,7 +191,7 @@ QVariant TarPackageCreationStep::data(Id id) const void TarPackageCreationStep::raiseError(const QString &errorMessage) { emit addTask(DeploymentTask(Task::Error, errorMessage)); - emit addOutput(errorMessage, OutputFormat::Stderr); + emit addOutput(errorMessage, OutputFormat::ErrorMessage); } void TarPackageCreationStep::raiseWarning(const QString &warningMessage)