diff options
author | Tim Murison <tim.murison@spectrumdt.com> | 2014-11-28 22:10:51 -0500 |
---|---|---|
committer | Morten Johan Sørvig <morten.sorvig@theqtcompany.com> | 2015-02-06 08:37:30 +0000 |
commit | 104241306b844bdc8608cba7022aba0898f16ce4 (patch) | |
tree | 12d32ecee577b9045c1353d7b4f392794d2786ca | |
parent | 6774df3f54d06395f182c9119185ac2d9bd93c3f (diff) | |
download | qttools-104241306b844bdc8608cba7022aba0898f16ce4.tar.gz |
MacDeployQt: Handle absolute paths
Correctly compute 'cdupCount' when macdeployqt is
invoked on an absolute path.
Task-number: QTBUG-42954
Change-Id: Id7939610dfb4468b59fcb9dafc2e5da2b578ddba
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
-rw-r--r-- | src/macdeployqt/shared/shared.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index a6f0d1220..928dbff3b 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -436,7 +436,7 @@ void recursiveCopyAndDeploy(const QString &appBundlePath, const QString &sourceP // The (relative) link; with a correct number of "../"'s. QString linkPath = QStringLiteral("PlugIns/quick/") + file; - int cdupCount = linkDestinationPath.count(QStringLiteral("/")); + int cdupCount = linkDestinationPath.count(QStringLiteral("/")) - appBundlePath.count(QStringLiteral("/")); for (int i = 0; i < cdupCount - 2; ++i) linkPath.prepend("../"); |