Commit d5a8adc1 authored by Fawzi Mohamed's avatar Fawzi Mohamed
Browse files

ios: ensure that the private dependencies are resolved by dyld



Change-Id: I36f493dc83a906fb2291b156488531cfff633d4a
Reviewed-by: default avatarFawzi Mohamed <fawzi.mohamed@digia.com>
parent 9cb4b52e
......@@ -42,6 +42,7 @@
#include <QList>
#include <QScopedArrayPointer>
#include <QProcessEnvironment>
#include <QFileInfo>
#include <string.h>
#include <errno.h>
......@@ -203,6 +204,12 @@ IosToolHandlerPrivate::IosToolHandlerPrivate(IosToolHandler::DeviceType devType,
foreach (const QString &k, env.keys())
if (k.startsWith(QLatin1String("DYLD_")))
env.remove(k);
QString xcPath = IosConfigurations::developerPath().appendPath(QLatin1String("../OtherFrameworks")).toFileInfo().canonicalFilePath();
env.insert(QLatin1String("DYLD_FALLBACK_FRAMEWORK_PATH"),
xcPath.isEmpty() ?
QLatin1String("/System/Library/PrivateFrameworks")
: (xcPath + QLatin1String(":/System/Library/PrivateFrameworks")));
process.setProcessEnvironment(env);
QObject::connect(&process, SIGNAL(readyReadStandardOutput()), q, SLOT(subprocessHasData()));
QObject::connect(&process, SIGNAL(finished(int,QProcess::ExitStatus)),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment