diff options
| author | Teemu Katajisto <teemu.katajisto@digia.com> | 2012-07-24 14:25:21 +0300 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2012-09-25 10:37:17 +0200 |
| commit | 1f5e0021f0ac400dab075d4649320b237c2d3936 (patch) | |
| tree | 0dd6749b92b96423a58b3bfcc6fb739dd44afc9b /src/libs | |
| parent | 5804a06bc5cbea1b098573168876fda0163df250 (diff) | |
Fix Mac Qt framework id changing
Fix the case where Qt framework was not udpated with install_name_tool if
the framework name contained other numbers than 3 (e.g. QtV8 and QtQuick1).
Change-Id: I189c5d650982263ff27a3e18a2e0bd98983c5ce2
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/installer/macreplaceinstallnamesoperation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/installer/macreplaceinstallnamesoperation.cpp b/src/libs/installer/macreplaceinstallnamesoperation.cpp index 435df8eee..30b9451bd 100644 --- a/src/libs/installer/macreplaceinstallnamesoperation.cpp +++ b/src/libs/installer/macreplaceinstallnamesoperation.cpp @@ -215,7 +215,7 @@ void MacReplaceInstallNamesOperation::relocateBinary(const QString &fileName) "orginalBuildDir: %4)").arg(fileName, frameworkId, frameworks.join(QLatin1String("|")), originalBuildDir); // Use regexp to find matches from frameworks and static libs - QRegExp frameworkRegexp(QLatin1String("Qt[3a-zA-Z]*\\.framework/")); + QRegExp frameworkRegexp(QLatin1String("Qt[0-9a-zA-Z]*\\.framework/")); QRegExp dylibRegexp(QLatin1String("libQt.*\\.dylib")); QStringList args; // change framework ID only if Qt library reference |