Commit d28073d9 authored by Tor Arne Vestbø's avatar Tor Arne Vestbø Committed by The Qt Project
Browse files

Distinguish between 'mac' and 'macx' qmake scopes


The former applies both on Mac OS X and iOS, but 'macx' is specific to
Mac OS X.

ios.conf and macx.conf now share most of their settings in the common
mac.conf. We set the default QMAKE_MAC_SDK before loading mac.conf, so
that any overrides in the device config will apply afterwards. This
means configure's mkspec parsing will be able to read the QMAKE_MAC_SDK.

Change-Id: I0c7e26a6a0103e19b23ef152aa9e4ab461cee632
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: default avatarRichard Moe Gustavsen <richard.gustavsen@digia.com>
parent 950b35cf
Showing with 67 additions and 79 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment