diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2012-11-26 08:54:22 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-11-26 09:36:54 +0100 |
| commit | 9820278a708024cc1ae01372dfafabe4ff295b88 (patch) | |
| tree | f79977829e6131ebbf215989c562b20e1b161f92 /qtcreator.pri | |
| parent | 32a0afb9df4971aa433428340b30d773cae464f7 (diff) | |
| download | qt-creator-9820278a708024cc1ae01372dfafabe4ff295b88.tar.gz | |
Fix building against Qt5 on MacOS.
Qt5 will set the mmacosx-version-min to either 10.6 or 10.7, depending
on the mkspec used. These lines resulted in two mmacosx-version-min
flags, when libc++ is used (macx-clang-libc++ mkspec), this leads to
compiler errors. As Qt/qmake already adds the flag, there should not be
a need to set it in the .pri/.pro files.
Change-Id: Ib8cc59d2b064737aa0b5a889b2b3183eceaea1f3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 977f47ef1f..ed620d1ced 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -127,9 +127,12 @@ macx { IDE_BIN_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/MacOS copydata = 1 isEmpty(TIGER_COMPAT_MODE):TIGER_COMPAT_MODE=$$(QTC_TIGER_COMPAT) - isEmpty(TIGER_COMPAT_MODE) { - QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5 - QMAKE_LFLAGS *= -mmacosx-version-min=10.5 + !isEqual(QT_MAJOR_VERSION, 5) { + # Qt5 doesn't support 10.5, and will set the minimum version correctly to 10.6 or 10.7. + isEmpty(TIGER_COMPAT_MODE) { + QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5 + QMAKE_LFLAGS *= -mmacosx-version-min=10.5 + } } } else { contains(TEMPLATE, vc.*):vcproj = 1 |