Commit 9820278a authored by Erik Verbruggen's avatar Erik Verbruggen Committed by Eike Ziller

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: default avatarEike Ziller <eike.ziller@digia.com>
parent 32a0afb9
......@@ -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
......
Markdown is supported
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