diff options
author | Eike Ziller <eike.ziller@digia.com> | 2012-11-26 10:52:28 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2012-11-26 10:52:28 +0100 |
commit | 387f5a70065b6a21143f30a693b3946f43145aa1 (patch) | |
tree | 19499220eb78ffc2b83174768e4db33f36d33242 /qtcreator.pri | |
parent | c9afad98efee2e9d7eb09407395c8ad00f175f17 (diff) | |
parent | 9820278a708024cc1ae01372dfafabe4ff295b88 (diff) | |
download | qt-creator-387f5a70065b6a21143f30a693b3946f43145aa1.tar.gz |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
src/plugins/cpptools/cppcompletion_test.cpp
src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
src/plugins/qtsupport/baseqtversion.cpp
tests/auto/cplusplus/findusages/tst_findusages.cpp
Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63
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 6641479319..c4882530fa 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 |