summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@theqtcompany.com>2016-01-12 16:33:01 +0100
committerJoerg Bornemann <joerg.bornemann@theqtcompany.com>2016-01-12 15:38:51 +0000
commit88f6635ea8e8d9a541551c951386025bfd97afac (patch)
tree38530b84b9f6cf6c865ffee7ee807aff753c9872
parentfcf648db664d3ee30aae7bcb3aa53a99d1bf1d63 (diff)
windeployqt: print WebEngine-related errors only once
Fix usage of errorMessage in deployWebEngineCore. Change-Id: Ifd2f6b97396171dfb94419d149acac0d71a0007b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
-rw-r--r--src/windeployqt/main.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index 06a68e493..717af4ee6 100644
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -1476,10 +1476,8 @@ static bool deployWebEngineCore(const QMap<QString, QString> &qmakeVariables,
"qtwebengine_resources_200p.pak"};
std::wcout << "Deploying: " << webEngineProcessC << "...\n";
- if (!deployWebProcess(qmakeVariables, webEngineProcessC, options, errorMessage)) {
- std::wcerr << errorMessage << '\n';
+ if (!deployWebProcess(qmakeVariables, webEngineProcessC, options, errorMessage))
return false;
- }
const QString resourcesSubDir = QStringLiteral("/resources");
const QString resourcesSourceDir
= qmakeVariables.value(QStringLiteral("QT_INSTALL_DATA")) + resourcesSubDir
@@ -1490,7 +1488,6 @@ static bool deployWebEngineCore(const QMap<QString, QString> &qmakeVariables,
for (size_t i = 0; i < sizeof(installDataFiles)/sizeof(installDataFiles[0]); ++i) {
if (!updateFile(resourcesSourceDir + QLatin1String(installDataFiles[i]),
resourcesTargetDir, options.updateFileFlags, options.json, errorMessage)) {
- std::wcerr << errorMessage << '\n';
return false;
}
}