diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-11-10 11:39:35 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-11-10 11:39:35 +0100 |
| commit | d7a5dc0cfdae2fb22b7061301575f04f2bcc3f1c (patch) | |
| tree | 984a2638088671d2191fbd31e7076c756ab7dfb5 /mkspecs/common | |
| parent | 3d70925ee54d06e90bea392883d230b8ae2b1782 (diff) | |
| parent | 73a1e8c60d894701f34806cc4b847aa2814bf389 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4.0
Conflicts:
src/plugins/platforms/xcb/qxcbwindow.cpp
Change-Id: Iad9ef6bf7d6111efba8232a7d9b46bb9974912f5
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/clang.conf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf index 6235296ef3..2c29bb88fb 100644 --- a/mkspecs/common/clang.conf +++ b/mkspecs/common/clang.conf @@ -7,6 +7,9 @@ QMAKE_COMPILER = gcc clang llvm # clang pretends to be gcc QMAKE_CC = clang QMAKE_CXX = clang++ +QMAKE_LINK_C = $$QMAKE_CC +QMAKE_LINK_C_SHLIB = $$QMAKE_CC + QMAKE_LINK = $$QMAKE_CXX QMAKE_LINK_SHLIB = $$QMAKE_CXX |