3rdparty/ext_qt/0117-windeployqt-Warn-only-in-case-patching-of-Qt5Core-fails.patch

0001 From 112147de44d2ecd9b4cb33f6601f8aa29638ee37 Mon Sep 17 00:00:00 2001
0002 From: Friedemann Kleint <Friedemann.Kleint@qt.io>
0003 Date: Tue, 10 Sep 2019 10:09:11 +0200
0004 Subject: [PATCH] windeployqt: Warn only in case patching of Qt5Core fails
0005
0006 After qtbase/4ac872639ed0dd3ae6627e05bdda821f7d128500, can
0007 fail for relocatable builds:
0008
0009 Unable to patch ...\Qt5Core.dll: Could not locate pattern "qt_prfxpath="
0010
0011 Task-number: QTBUG-15234
0012 Change-Id: I6df337b369d5e4c461293193bfe1c63e08b7fd35
0013 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
0014 ---
0015
0016 diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
0017 index 00fa4fb..a4ceded 100644
0018 --- a/src/windeployqt/main.cpp
0019 +++ b/src/windeployqt/main.cpp
0020 @@ -1494,8 +1494,10 @@
0021              const QString qt5CoreName = QFileInfo(libraryPath(libraryLocation, "Qt5Core", qtLibInfix,
0022                                                                options.platform, isDebug)).fileName();
0023
0024 -            if (!patchQtCore(targetPath + QLatin1Char('/') + qt5CoreName, errorMessage))
0025 -                return result;
0026 +            if (!patchQtCore(targetPath + QLatin1Char('/') + qt5CoreName, errorMessage)) {
0027 +                std::wcerr << "Warning: " << *errorMessage << '\n';
0028 +                errorMessage->clear();
0029 +            }
0030          }
0031      } // optLibraries
0032