From 274bbefeff4b03880d4996eb0e833834fdb8261b Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 20 May 2019 17:22:52 +0200 Subject: [PATCH] iOS: Remove remaining FileName::appendPath uses Change-Id: Ia550151bbcad696a3bd59e630e80a8f89a908e08 Reviewed-by: Eike Ziller --- src/plugins/ios/iostoolhandler.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp index d01e0c01143..f3ed0667b0f 100644 --- a/src/plugins/ios/iostoolhandler.cpp +++ b/src/plugins/ios/iostoolhandler.cpp @@ -657,18 +657,14 @@ IosDeviceToolHandlerPrivate::IosDeviceToolHandlerPrivate(const IosDeviceType &de if (k.startsWith(QLatin1String("DYLD_"))) env.remove(k); QStringList frameworkPaths; - Utils::FileName xcPath = IosConfigurations::developerPath(); - QString privateFPath = xcPath.appendPath(QLatin1String("Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks")).toFileInfo().canonicalFilePath(); - if (!privateFPath.isEmpty()) - frameworkPaths << privateFPath; - QString otherFPath = xcPath.appendPath(QLatin1String("../OtherFrameworks")).toFileInfo().canonicalFilePath(); - if (!otherFPath.isEmpty()) - frameworkPaths << otherFPath; - QString sharedFPath = xcPath.appendPath(QLatin1String("../SharedFrameworks")).toFileInfo().canonicalFilePath(); - if (!sharedFPath.isEmpty()) - frameworkPaths << sharedFPath; - frameworkPaths << QLatin1String("/System/Library/Frameworks") - << QLatin1String("/System/Library/PrivateFrameworks"); + const Utils::FileName libPath = IosConfigurations::developerPath().pathAppended("Platforms/iPhoneSimulator.platform/Developer/Library"); + for (const auto framework : {"PrivateFrameworks", "OtherFrameworks", "SharedFrameworks"}) { + const QString frameworkPath = + libPath.pathAppended(QLatin1String(framework)).toFileInfo().canonicalFilePath(); + if (!frameworkPath.isEmpty()) + frameworkPaths << frameworkPath; + } + frameworkPaths << "/System/Library/Frameworks" << "/System/Library/PrivateFrameworks"; env.insert(QLatin1String("DYLD_FALLBACK_FRAMEWORK_PATH"), frameworkPaths.join(QLatin1Char(':'))); qCDebug(toolHandlerLog) << "IosToolHandler runEnv:" << env.toStringList(); process->setProcessEnvironment(env);