TianZD/linuxdeployqt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove another macOS Frameworks specific case

Browse Source
This commit is contained in:
probonopd
2016-09-05 21:48:53 +02:00
parent 6325cd4140
commit 4c0da30bb0
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/shared.cpp
+1 -12
View File
@@ -297,17 +297,6 @@ FrameworkInfo parseOtoolLibraryLine(const QString &line, const QString &appBundl
state = End; state = End;
++part; ++part;
continue; continue;
} else if (state == Version) {
info.version = currentPart;
info.binaryDirectory = "Versions/" + info.version;
info.binaryName = name + suffix;
info.binaryPath = "/" + info.binaryDirectory + "/" + info.binaryName;
info.deployedInstallName = "$ORIGIN"; // + info.frameworkName + info.binaryPath;
info.frameworkPath = info.frameworkDirectory + info.frameworkName;
info.sourceFilePath = info.frameworkPath + info.binaryPath;
info.frameworkDestinationDirectory = bundleFrameworkDirectory + "/" + info.frameworkName;
info.binaryDestinationDirectory = info.frameworkDestinationDirectory + "/" + info.binaryDirectory;
state = End;
} else if (state == End) { } else if (state == End) {
break; break;
} }
@@ -655,7 +644,7 @@ DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks,
bool useLoaderPath) bool useLoaderPath)
{ {
LogNormal(); LogNormal();
LogNormal() << "Deploying Qt frameworks found inside:" << binaryPaths; LogNormal() << "Deploying libraries found inside:" << binaryPaths;
QStringList copiedFrameworks; QStringList copiedFrameworks;
DeploymentInfo deploymentInfo; DeploymentInfo deploymentInfo;
deploymentInfo.useLoaderPath = useLoaderPath; deploymentInfo.useLoaderPath = useLoaderPath;