diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 03:03:51 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 03:03:51 +0200 |
commit | 7eb201e83514c5c949fcf0f8beebe7858c2d1ace (patch) | |
tree | bcbf3e2a449fd853050131ccf3360fef326afe97 /src/windeployqt/main.cpp | |
parent | cbb56d8dab2447ce8fda454e6c6cd6938dffacb1 (diff) | |
parent | 99f449410c680142e58bf6cdd56c583b2c57b9b6 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Idd890e296d820cbe335798d33e8592b9015b2a4a
Diffstat (limited to 'src/windeployqt/main.cpp')
-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 |