From: Tim Murison <tim.murison@spectrumdt.com>
Date: Sat, 29 Nov 2014 03:10:51 +0000 (-0500)
Subject: MacDeployQt: Handle absolute paths
X-Git-Tag: v5.5.90+alpha1~28^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=104241306b844bdc8608cba7022aba0898f16ce4;p=platform%2Fupstream%2Fqttools.git

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>
---

diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp
index a6f0d12..928dbff 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("../");