Remove extra linebreak from ConsumeOutput operation

ConsumeOutput may be run to fetch a file path. Extra line break in the
end will cause problems.

Change-Id: I61133a66fb3d3a6961e9f79c11f783b5d103f046
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>

2 files changed, 2 insertions, 2 deletions

diff --git a/src/libs/installer/consumeoutputoperation.cpp b/src/libs/installer/consumeoutputoperation.cpp
index 2de149142..e9b8d1295 100644
--- a/src/libs/installer/consumeoutputoperation.cpp
+++ b/src/libs/installer/consumeoutputoperation.cpp
@@ -122,7 +122,7 @@ bool ConsumeOutputOperation::performOperation()
         qCWarning(QInstaller::lcInstallerInstallLog) << "Cannot get any query output from executable"
             << executable;
     }
-    core->setValue(installerKeyName, QString::fromLocal8Bit(executableOutput));
+    core->setValue(installerKeyName, QString::fromLocal8Bit(executableOutput.trimmed()));
     return true;
 }
 
diff --git a/tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp b/tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp
index 32f8c2d5c..c0c8d7390 100644
--- a/tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp
+++ b/tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp
@@ -125,7 +125,7 @@ private:
         if (process.state() != QProcess::NotRunning)
             loop.exec();
 
-        return process.readAllStandardOutput();
+        return process.readAllStandardOutput().trimmed();
     }