diff options
| author | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2013-12-04 12:57:07 +0100 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2013-12-04 15:39:24 +0100 |
| commit | fccffba04bbac0439583272b1c73151e9a00b0c6 (patch) | |
| tree | e4aaeb609ce15230863b47568a602e4bbd534be9 | |
| parent | 5bc6f1e390175a5687b3fef7e6cd3a2329a81837 (diff) | |
ios: fixing DYLD_FALLBACK_FRAMEWORK_PATH
adding /System/Library/Frameworks for completeness
Change-Id: If2fbe015af591eb3ff820b2ea2f732b2d4c08e01
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
| -rw-r--r-- | src/plugins/ios/iostoolhandler.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp index d78fd473c7..bda73d5bab 100644 --- a/src/plugins/ios/iostoolhandler.cpp +++ b/src/plugins/ios/iostoolhandler.cpp @@ -204,12 +204,15 @@ IosToolHandlerPrivate::IosToolHandlerPrivate(IosToolHandler::DeviceType devType, foreach (const QString &k, env.keys()) if (k.startsWith(QLatin1String("DYLD_"))) env.remove(k); + QStringList frameworkPaths; QString xcPath = IosConfigurations::developerPath().appendPath(QLatin1String("../OtherFrameworks")).toFileInfo().canonicalFilePath(); - env.insert(QLatin1String("DYLD_FALLBACK_FRAMEWORK_PATH"), - xcPath.isEmpty() ? - QString::fromLatin1("/System/Library/PrivateFrameworks") - : (xcPath + QLatin1String(":/System/Library/PrivateFrameworks"))); - + if (!xcPath.isEmpty()) + frameworkPaths << xcPath; + frameworkPaths << QLatin1String("/System/Library/Frameworks") + << QLatin1String("/System/Library/PrivateFrameworks"); + env.insert(QLatin1String("DYLD_FALLBACK_FRAMEWORK_PATH"), frameworkPaths.join(QLatin1Char(':'))); + if (debugToolHandler) + qDebug() << "IosToolHandler runEnv:" << env.toStringList(); process.setProcessEnvironment(env); QObject::connect(&process, SIGNAL(readyReadStandardOutput()), q, SLOT(subprocessHasData())); QObject::connect(&process, SIGNAL(finished(int,QProcess::ExitStatus)), |