Merge from Release-Engine-Staging @ 17030559 to Release-Engine-Test

This represents UE4/Main @ 17030256 and Dev-PerfTest @ 17030553

[CL 17031509 by aurel cordonnier in ue5-release-engine-test branch]
This commit is contained in:
aurel cordonnier
2021-08-03 11:56:47 -04:00
parent 964f82c661
commit dc4bf61540
1603 changed files with 40718 additions and 38345 deletions

View File

@@ -53,5 +53,8 @@ public class EpicWebHelperTarget : TargetRules
// Epic Games Launcher needs to run on OS X 10.9, so CEFSubProcess needs this as well
bEnableOSX109Support = true;
// Already a manifest specified through resource file
WindowsPlatform.ManifestFile = null;
}
}