diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-10-14 13:55:50 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-14 14:48:20 +0200 |
| commit | 1c1b386a41d00e9b0f386667737ee8e2b8affe97 (patch) | |
| tree | 237b466d13ea2bac49b04bd3ee8b26f21af7a717 /src/windeployqt/main.cpp | |
| parent | e4177a8db1144f52d71df7ebab2e6755ae21fb01 (diff) | |
| parent | 8ed4ee82552ec61f657b2b681002c5d7813e6e76 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/linguist/lupdate/cpp_clang.cpp
src/linguist/lupdate/cpp_clang.h
src/linguist/lupdate/main.cpp
src/qdoc/qdoc.pro
src/windeployqt/main.cpp
Change-Id: I467e502a6186d9e6b7fc92b652de89f296740e5d
Diffstat (limited to 'src/windeployqt/main.cpp')
| -rw-r--r-- | src/windeployqt/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index 38869b282..48b28f3ee 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 qt6CoreName = QFileInfo(libraryPath(libraryLocation, "Qt6Core", qtLibInfix, options.platform, isDebug)).fileName(); - +#ifndef QT_RELOCATABLE if (!patchQtCore(targetPath + QLatin1Char('/') + qt6CoreName, errorMessage)) { std::wcerr << "Warning: " << *errorMessage << '\n'; errorMessage->clear(); } +#endif } } // optLibraries |