diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-23 18:07:22 +0200 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-10 06:36:52 +0000 |
| commit | e005e99005d83e89ef2499320306c46a14965e7a (patch) | |
| tree | 926718b7c283edf85985d031c026ba6d2488c6b9 /configure | |
| parent | 196d55ba5c8d169d120f17ca1db3d85ea1e5b4dd (diff) | |
fix ios device&simulator builds again
the assumption stated in b67a0836d is actually invalid - configure sets
build_all without debug_and_release there. debug_and_release does
actually imply build_all, though.
to make things less confusing, don't let configure inject
iphonesimulator_and_iphoneos into all projects, but handle it like
debug_and_release instead.
Change-Id: Ib7acdc63308a538862fc603428f81aba60bca08e
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -3422,8 +3422,7 @@ if [ "$XPLATFORM_IOS" = "yes" ]; then # If the user passes -sdk on the command line we build a SDK-specific Qt build. # Otherwise we build a joined simulator and device build, which is the default. if [ -z "$OPT_MAC_SDK" ]; then - QT_CONFIG="$QT_CONFIG build_all" - QTCONFIG_CONFIG="$QTCONFIG_CONFIG iphonesimulator_and_iphoneos" + QT_CONFIG="$QT_CONFIG build_all simulator_and_device" fi fi |