diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2013-07-10 13:46:06 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@digia.com> | 2013-08-05 11:51:35 +0200 |
| commit | 0321d280b243af04fba88e86b8d83c2d0e01f330 (patch) | |
| tree | 5fe18f44572332be29accb31e63c2cb6248831b9 /src/libs | |
| parent | 550de62138a0deb2873814f35c9def2294666535 (diff) | |
Mac: Patch also paths to files that still exist
This regularly breaks Qt builds in the internal build systems: The
build machines might have still an 'old' build of Qt at the original
location.
Change-Id: I14df89606f795bf064f5864e0426d7b6702e3b28
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/installer/macreplaceinstallnamesoperation.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libs/installer/macreplaceinstallnamesoperation.cpp b/src/libs/installer/macreplaceinstallnamesoperation.cpp index a79072481..fa5e6139a 100644 --- a/src/libs/installer/macreplaceinstallnamesoperation.cpp +++ b/src/libs/installer/macreplaceinstallnamesoperation.cpp @@ -198,9 +198,8 @@ void MacReplaceInstallNamesOperation::relocateBinary(const MacBinaryInfo &info, // change framework ID only if dynamicLibId isn't only the filename, if it has no relative path ("@") - // and is not existing at the current looking for location if (!info.dynamicLibId.isEmpty() && (info.dynamicLibId != QFileInfo(info.fileName).fileName()) - && !info.dynamicLibId.contains(QLatin1String("@")) && !QFileInfo(info.dynamicLibId).exists()) { + && !info.dynamicLibId.contains(QLatin1String("@"))) { // error is set inside the execCommand method if (!execCommand(QLatin1String("install_name_tool"), QStringList(QLatin1String("-id")) << info.fileName << info.fileName)) { |