diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-10 10:09:11 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-10 12:29:21 +0200 |
| commit | 112147de44d2ecd9b4cb33f6601f8aa29638ee37 (patch) | |
| tree | a0a6df8524cfcde98218c7828f17e7939d6116ab | |
| parent | 2174b1a34a0754376b77528161bf2328855cb0e7 (diff) | |
| download | qttools-112147de44d2ecd9b4cb33f6601f8aa29638ee37.tar.gz | |
windeployqt: Warn only in case patching of Qt5Core fails
After qtbase/4ac872639ed0dd3ae6627e05bdda821f7d128500, can
fail for relocatable builds:
Unable to patch ...\Qt5Core.dll: Could not locate pattern "qt_prfxpath="
Task-number: QTBUG-15234
Change-Id: I6df337b369d5e4c461293193bfe1c63e08b7fd35
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -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 |