diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-11 08:23:45 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-11 08:23:51 +0200 |
| commit | 99f449410c680142e58bf6cdd56c583b2c57b9b6 (patch) | |
| tree | 7c86cd53083967e165207c41df8a13c10856116d | |
| parent | f80071bb6d038445fff1a595a9cd8394f91b7131 (diff) | |
| parent | 529d6b538c91aa3304fb9bb9e497d8ef96c197f9 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
| -rw-r--r-- | src/windeployqt/main.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index 00fa4fbc4..a4cededce 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -1494,8 +1494,10 @@ static DeployResult deploy(const Options &options, const QString qt5CoreName = QFileInfo(libraryPath(libraryLocation, "Qt5Core", qtLibInfix, options.platform, isDebug)).fileName(); - if (!patchQtCore(targetPath + QLatin1Char('/') + qt5CoreName, errorMessage)) - return result; + if (!patchQtCore(targetPath + QLatin1Char('/') + qt5CoreName, errorMessage)) { + std::wcerr << "Warning: " << *errorMessage << '\n'; + errorMessage->clear(); + } } } // optLibraries |