macx-ios-clang: only provide default LaunchScreen.xib if using Xcode 6
If using an older version of Xcode, Xcode will sometimes complain that LaunchScreen.xib uses auto layout while the project at the same time has deployment target set to 5.0 (where auto layout is not supported). This is a bug in Xcode really, since LaunchScreen.xib will only be used when running on iOS 7 (otherwise a LaunchImage will be used). This has been fixed in Xcode 6. This patch adds a check for this early on. Change-Id: Ie612c25b413add23e15fc3cb4f9e30bb5292369d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
This commit is contained in:
parent
504ab80f6d
commit
8d2da358b7
@ -185,13 +185,17 @@ macx-xcode {
|
|||||||
launch_images.files = $$copy_image.output
|
launch_images.files = $$copy_image.output
|
||||||
QMAKE_BUNDLE_DATA += launch_images
|
QMAKE_BUNDLE_DATA += launch_images
|
||||||
|
|
||||||
# Set up default LaunchScreen to support iPhone6/6+
|
lessThan(QMAKE_XCODE_VERSION, "6.0") {
|
||||||
launch_screen = LaunchScreen.xib
|
warning("You need to update Xcode to version 6 or newer to fully support iPhone6/6+")
|
||||||
copy_launch_screen.input = $$QMAKESPEC/$$launch_screen
|
} else {
|
||||||
copy_launch_screen.output = $$OUT_PWD/$${TARGET}.xcodeproj/$$launch_screen
|
# Set up default LaunchScreen to support iPhone6/6+
|
||||||
QMAKE_SUBSTITUTES += copy_launch_screen
|
launch_screen = LaunchScreen.xib
|
||||||
launch_screens.files = $$copy_launch_screen.output
|
copy_launch_screen.input = $$QMAKESPEC/$$launch_screen
|
||||||
QMAKE_BUNDLE_DATA += launch_screens
|
copy_launch_screen.output = $$OUT_PWD/$${TARGET}.xcodeproj/$$launch_screen
|
||||||
|
QMAKE_SUBSTITUTES += copy_launch_screen
|
||||||
|
launch_screens.files = $$copy_launch_screen.output
|
||||||
|
QMAKE_BUNDLE_DATA += launch_screens
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
macx-xcode {
|
macx-xcode {
|
||||||
|
Loading…
Reference in New Issue
Block a user