diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-10 09:11:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-09-10 12:12:46 +0200 |
| commit | 683e144efbd91163795dc582aedc210c7d78de4d (patch) | |
| tree | 2211fffdbaad8bad9569f63e017e7caf85eec2b6 /configure.pri | |
| parent | b66357e3ebf3e3dbda04f880e87184e247882843 (diff) | |
| parent | 1f1e2aa57b480f0b227e11d0cff0b3cfcffb1f39 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
mkspecs/common/macx.conf
Change-Id: I8576493b417912fa5e5501bc2c1b935d186ac209
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri index a8ef2c27d4..3747f96f3d 100644 --- a/configure.pri +++ b/configure.pri @@ -1132,6 +1132,8 @@ defineReplace(qtConfOutputPostProcess_publicPro) { "QT_GCC_MINOR_VERSION = $$QMAKE_GCC_MINOR_VERSION" \ "QT_GCC_PATCH_VERSION = $$QMAKE_GCC_PATCH_VERSION" } + !isEmpty(QMAKE_MAC_SDK_VERSION): \ + output += "QT_MAC_SDK_VERSION = $$QMAKE_MAC_SDK_VERSION" !isEmpty(QMAKE_CLANG_MAJOR_VERSION) { output += \ "QT_CLANG_MAJOR_VERSION = $$QMAKE_CLANG_MAJOR_VERSION" \ |