diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-03-01 12:14:10 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-02 12:58:18 +0100 |
commit | c4249e1e920f8bb0fc6a45bce11f0ae825da3597 (patch) | |
tree | f12cbc7b88cbd4caa6a21c1d1831abb58e76e766 /LGPL_EXCEPTION.txt | |
parent | 93c6284696db9ca88b663b0d11cf07871f6475a9 (diff) |
Pick up QMAKE_MACOSX_DEPLOYMENT_TARGET from mkspec when building qmake
Instead of setting it explicitly to 10.6. Before 736e4258a this was
not a problem, as we were hard-coding the version flags as part of
the C/CXX_FLAGS for each makespec, so getQMakeConf would pick
them up automatically. When 736e4258a introduced sdk.prf as the
place to resolve these flags in a single place, it broke the
qmake build for macx-clang-libc++, as we were then falling
back to the 10.6 target hard-coded in configure.
We fix this by duplicating some of the logic from sdk.prf, by
pulling out the QMAKE_MACOSX_DEPLOYMENT_TARGET variable
and adding to the C/CXX_FLAGS.
Change-Id: I04afc7525031727c2504588c70dd3f7892cc8e42
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'LGPL_EXCEPTION.txt')
0 files changed, 0 insertions, 0 deletions