diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-11 08:41:49 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-11 08:49:50 +0200 |
| commit | 98d4ae0ad61a3f51d4803d08ab8c16783d822b62 (patch) | |
| tree | 61a450fbe870b155c482f3d24e8badb79dda4e4c | |
| parent | 112147de44d2ecd9b4cb33f6601f8aa29638ee37 (diff) | |
| download | qttools-98d4ae0ad61a3f51d4803d08ab8c16783d822b62.tar.gz | |
Don't patch QtCore when -feature-relocatable is enabled
The reasons:
1) Patching is not needed anymore
2) It will fail in a Release build because the symbol
windeployqt is looking for is optimized away.
Task-number: QTBUG-15234
Change-Id: I930b5470f038778bf7e3aa8d82e5d11fccc9f001
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | src/windeployqt/main.cpp | 3 | ||||
| -rw-r--r-- | src/windeployqt/windeployqt.pro | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index a4cededce..1fefc6d21 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -1493,11 +1493,12 @@ static DeployResult deploy(const Options &options, if (options.patchQt && !options.dryRun && !options.isWinRt()) { const QString qt5CoreName = QFileInfo(libraryPath(libraryLocation, "Qt5Core", qtLibInfix, options.platform, isDebug)).fileName(); - +#ifndef QT_RELOCATABLE if (!patchQtCore(targetPath + QLatin1Char('/') + qt5CoreName, errorMessage)) { std::wcerr << "Warning: " << *errorMessage << '\n'; errorMessage->clear(); } +#endif } } // optLibraries diff --git a/src/windeployqt/windeployqt.pro b/src/windeployqt/windeployqt.pro index fb12a12f3..cd09c238f 100644 --- a/src/windeployqt/windeployqt.pro +++ b/src/windeployqt/windeployqt.pro @@ -10,4 +10,7 @@ CONFIG += force_bootstrap win32: LIBS += -lshlwapi QMAKE_TARGET_DESCRIPTION = "Qt Windows Deployment Tool" + +qtConfig(relocatable): DEFINES += QT_RELOCATABLE + load(qt_tool) |