diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-01 22:15:55 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-01 22:15:55 +0200 |
commit | 3e949b75fd298a30fa4e8b281ecf21fcb038efbe (patch) | |
tree | 592bb2d6ca846a9d3aee66bc829d21ae8ba8c056 /mkspecs/common | |
parent | 4518345b80b0ee1101ecb0e7349728abd237aa6e (diff) | |
parent | d2b4a789c39eb770068b002d2bc9ceb764dedf3d (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
mkspecs/features/mac/default_pre.prf
mkspecs/macx-ios-clang/features/resolve_config.prf
qtbase.pro
Change-Id: I65b5ebca4942a4f295bdd4ac1568e5c347333aea
Diffstat (limited to 'mkspecs/common')
-rw-r--r-- | mkspecs/common/mac.conf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index b19b0853cb..78b939cc9e 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -31,6 +31,8 @@ QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL QMAKE_LIBS_THREAD = +QMAKE_ACTOOL = actool + QMAKE_DSYMUTIL = dsymutil QMAKE_STRIP = strip QMAKE_STRIPFLAGS_LIB += -S -x |