forked from qt-creator/qt-creator
ios: fix compilation on other platforms
fix ternary operator types Change-Id: I4f9a0eb100fd6ca4e65e91ef67a53331d3f8faaa Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
committed by
Friedemann Kleint
parent
dc7f2a9bd5
commit
11037dfcb2
@@ -207,7 +207,7 @@ IosToolHandlerPrivate::IosToolHandlerPrivate(IosToolHandler::DeviceType devType,
|
|||||||
QString xcPath = IosConfigurations::developerPath().appendPath(QLatin1String("../OtherFrameworks")).toFileInfo().canonicalFilePath();
|
QString xcPath = IosConfigurations::developerPath().appendPath(QLatin1String("../OtherFrameworks")).toFileInfo().canonicalFilePath();
|
||||||
env.insert(QLatin1String("DYLD_FALLBACK_FRAMEWORK_PATH"),
|
env.insert(QLatin1String("DYLD_FALLBACK_FRAMEWORK_PATH"),
|
||||||
xcPath.isEmpty() ?
|
xcPath.isEmpty() ?
|
||||||
QLatin1String("/System/Library/PrivateFrameworks")
|
QString::fromLatin1("/System/Library/PrivateFrameworks")
|
||||||
: (xcPath + QLatin1String(":/System/Library/PrivateFrameworks")));
|
: (xcPath + QLatin1String(":/System/Library/PrivateFrameworks")));
|
||||||
|
|
||||||
process.setProcessEnvironment(env);
|
process.setProcessEnvironment(env);
|
||||||
|
|||||||
Reference in New Issue
Block a user