From 11037dfcb2d3fb01ec1aefdb624f74966447eba7 Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Mon, 2 Dec 2013 12:52:45 +0100 Subject: [PATCH] ios: fix compilation on other platforms fix ternary operator types Change-Id: I4f9a0eb100fd6ca4e65e91ef67a53331d3f8faaa Reviewed-by: Nikita Baryshnikov Reviewed-by: Friedemann Kleint --- src/plugins/ios/iostoolhandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp index a70d9152a0a..d78fd473c70 100644 --- a/src/plugins/ios/iostoolhandler.cpp +++ b/src/plugins/ios/iostoolhandler.cpp @@ -207,7 +207,7 @@ IosToolHandlerPrivate::IosToolHandlerPrivate(IosToolHandler::DeviceType devType, QString xcPath = IosConfigurations::developerPath().appendPath(QLatin1String("../OtherFrameworks")).toFileInfo().canonicalFilePath(); env.insert(QLatin1String("DYLD_FALLBACK_FRAMEWORK_PATH"), xcPath.isEmpty() ? - QLatin1String("/System/Library/PrivateFrameworks") + QString::fromLatin1("/System/Library/PrivateFrameworks") : (xcPath + QLatin1String(":/System/Library/PrivateFrameworks"))); process.setProcessEnvironment(env);