diff options
| author | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2013-11-29 01:20:00 +0100 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2013-12-02 12:35:39 +0100 |
| commit | d5a8adc1560135a46ff4aac2dbced1a7b4acfbd6 (patch) | |
| tree | f300442b13f2351191f109f3a9c5af80c3ff67f9 /src/plugins/ios/iostoolhandler.cpp | |
| parent | 9cb4b52ed4e3bc9582acb133122f3097f10bb4e2 (diff) | |
| download | qt-creator-d5a8adc1560135a46ff4aac2dbced1a7b4acfbd6.tar.gz | |
ios: ensure that the private dependencies are resolved by dyld
Change-Id: I36f493dc83a906fb2291b156488531cfff633d4a
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Diffstat (limited to 'src/plugins/ios/iostoolhandler.cpp')
| -rw-r--r-- | src/plugins/ios/iostoolhandler.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp index c1984f2275..a70d9152a0 100644 --- a/src/plugins/ios/iostoolhandler.cpp +++ b/src/plugins/ios/iostoolhandler.cpp @@ -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)), |