summaryrefslogtreecommitdiffstats
path: root/src/macdeployqt/shared/shared.h
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@digia.com>2014-09-24 12:06:47 +0200
committerMorten Johan Sørvig <morten.sorvig@digia.com>2014-10-01 10:50:22 +0200
commita58505987ca43850cec8c8f33665feb33c1187fb (patch)
treeabc7a6ee94697ccad1bc802deec82a8ed19fc9f0 /src/macdeployqt/shared/shared.h
parent378d04837cb0033031f26269b1194855870ee1d6 (diff)
Fix framework bundle deployment
Rework copyFramework(). Split out dylib deployment into copyDylib(). Remove the special symlink handling. Always create symlinks from "Current" to the actual version. This ensures we're compatible with Apple's framework bundle spec [1]. It also makes the 'codesign' utility happy, easing the step to sandbox Qt OS X applications. [1]: https://developer.apple.com/library/mac/documentation/ macosx/conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html Task-number: QTBUG-32896 Change-Id: Ide23437c9bb6515d5013d37ae6ff4133a69085ad Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src/macdeployqt/shared/shared.h')
-rw-r--r--src/macdeployqt/shared/shared.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/macdeployqt/shared/shared.h b/src/macdeployqt/shared/shared.h
index 8c6ea0bfe..0fe7400fb 100644
--- a/src/macdeployqt/shared/shared.h
+++ b/src/macdeployqt/shared/shared.h
@@ -56,6 +56,7 @@ extern bool runStripEnabled;
class FrameworkInfo
{
public:
+ bool isDylib;
QString frameworkDirectory;
QString frameworkName;
QString frameworkPath;
@@ -66,7 +67,8 @@ public:
QString installName;
QString deployedInstallName;
QString sourceFilePath;
- QString destinationDirectory;
+ QString frameworkDestinationDirectory;
+ QString binaryDestinationDirectory;
};
bool operator==(const FrameworkInfo &a, const FrameworkInfo &b);