diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-02-08 12:21:10 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-02-14 08:36:51 +0000 |
| commit | 23a3471ee8600eb5d5ae1da5f2cb907e58740dc4 (patch) | |
| tree | db0a646c8b5de5d35cc3e3ff6a5a6a6292fbcb41 /qtcreator.pri | |
| parent | 37891d92bc1c13d035b6eaefac5e45d0ea638b0f (diff) | |
macOS: Fix build issue with Qt 5.6
std::future is disabled when compiling with target 10.7, so
we need to enforce 10.8 when building against Qt 5.6 which has
default deployment target 10.7
Change-Id: I8d7b2646d0fb5268f82f5e01dae1f7e40a80bb8b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index e29583b653..82d15419d6 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -58,6 +58,12 @@ defineReplace(stripSrcDir) { return($$relative_path($$absolute_path($$1, $$OUT_PWD), $$_PRO_FILE_PWD_)) } +macos:!minQtVersion(5, 7, 0) { + # Qt 5.6 still sets deployment target 10.7, which does not work + # with all C++11/14 features (e.g. std::future) + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 +} + QTC_BUILD_TESTS = $$(QTC_BUILD_TESTS) !isEmpty(QTC_BUILD_TESTS):TEST = $$QTC_BUILD_TESTS |