diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/windeployqt/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/tools/windeployqt/main.cpp | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/tools/windeployqt/CMakeLists.txt b/src/tools/windeployqt/CMakeLists.txt index 4531124f31..e1ea486595 100644 --- a/src/tools/windeployqt/CMakeLists.txt +++ b/src/tools/windeployqt/CMakeLists.txt @@ -28,8 +28,3 @@ qt_internal_extend_target(${target_name} CONDITION WIN32 PUBLIC_LIBRARIES shlwapi ) - -qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_relocatable - DEFINES - QT_RELOCATABLE -) diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp index 9d483e123f..132b3d5d25 100644 --- a/src/tools/windeployqt/main.cpp +++ b/src/tools/windeployqt/main.cpp @@ -22,6 +22,8 @@ #define IMAGE_FILE_MACHINE_ARM64 0xaa64 #endif +#include <QtCore/private/qconfig_p.h> + #include <algorithm> #include <iostream> #include <iterator> @@ -1452,16 +1454,16 @@ static DeployResult deploy(const Options &options, const QMap<QString, QString> return result; } +#if !QT_CONFIG(relocatable) if (options.patchQt && !options.dryRun) { const QString qt6CoreName = QFileInfo(libraryPath(libraryLocation, "Qt6Core", qtLibInfix, options.platform, result.isDebug)).fileName(); -#ifndef QT_RELOCATABLE if (!patchQtCore(targetPath + u'/' + qt6CoreName, errorMessage)) { std::wcerr << "Warning: " << *errorMessage << '\n'; errorMessage->clear(); } -#endif } +#endif // QT_CONFIG(relocatable) } // optLibraries // Update plugins |