3rdparty/ext_qt/0118-Don-t-patch-QtCore-when--feature-relocatable-is-enabled.patch

0001 From 98d4ae0ad61a3f51d4803d08ab8c16783d822b62 Mon Sep 17 00:00:00 2001
0002 From: Alexandru Croitor <alexandru.croitor@qt.io>
0003 Date: Wed, 11 Sep 2019 08:41:49 +0200
0004 Subject: [PATCH] Don't patch QtCore when -feature-relocatable is enabled
0005
0006 The reasons:
0007 1) Patching is not needed anymore
0008 2) It will fail in a Release build because the symbol
0009    windeployqt is looking for is optimized away.
0010
0011 Task-number: QTBUG-15234
0012 Change-Id: I930b5470f038778bf7e3aa8d82e5d11fccc9f001
0013 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
0014 ---
0015
0016 diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
0017 index a4ceded..1fefc6d 100644
0018 --- a/src/windeployqt/main.cpp
0019 +++ b/src/windeployqt/main.cpp
0020 @@ -1493,11 +1493,12 @@
0021          if (options.patchQt  && !options.dryRun && !options.isWinRt()) {
0022              const QString qt5CoreName = QFileInfo(libraryPath(libraryLocation, "Qt5Core", qtLibInfix,
0023                                                                options.platform, isDebug)).fileName();
0024 -
0025 +#ifndef QT_RELOCATABLE
0026              if (!patchQtCore(targetPath + QLatin1Char('/') + qt5CoreName, errorMessage)) {
0027                  std::wcerr << "Warning: " << *errorMessage << '\n';
0028                  errorMessage->clear();
0029              }
0030 +#endif
0031          }
0032      } // optLibraries
0033
0034 diff --git a/src/windeployqt/windeployqt.pro b/src/windeployqt/windeployqt.pro
0035 index fb12a12..cd09c23 100644
0036 --- a/src/windeployqt/windeployqt.pro
0037 +++ b/src/windeployqt/windeployqt.pro
0038 @@ -10,4 +10,7 @@
0039  win32: LIBS += -lshlwapi
0040
0041  QMAKE_TARGET_DESCRIPTION = "Qt Windows Deployment Tool"
0042 +
0043 +qtConfig(relocatable): DEFINES += QT_RELOCATABLE
0044 +
0045  load(qt_tool)