From 104241306b844bdc8608cba7022aba0898f16ce4 Mon Sep 17 00:00:00 2001 From: Tim Murison Date: Fri, 28 Nov 2014 22:10:51 -0500 Subject: [PATCH] MacDeployQt: Handle absolute paths MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Correctly compute 'cdupCount' when macdeployqt is invoked on an absolute path. Task-number: QTBUG-42954 Change-Id: Id7939610dfb4468b59fcb9dafc2e5da2b578ddba Reviewed-by: Morten Johan Sørvig --- src/macdeployqt/shared/shared.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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("../"); -- 2.7.4