diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-12 13:53:21 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-12 13:53:22 +0100 |
| commit | d3b3be6865b78479da6c7e822b80064a6ea08554 (patch) | |
| tree | 4843426950d1bc933ee8685c94f8905f20f3d678 /qmake | |
| parent | 7472415f3f331ccd415cc644cc210d2457ef690c (diff) | |
| parent | fd88c152db0949e47613858a914a6ae4a825781d (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Iad53d4f21263718b8ecf15fd2d1170d24c7b675d
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.win32 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index ed738e0c02..3f13df884a 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -12,11 +12,11 @@ QMKSRC = $(SOURCE_PATH)\qmake # !if "$(QMAKESPEC)" == "win32-icc" CXX = icl -LINKER = link +LINKER = xilink CFLAGS_EXTRA = /Zc:forScope /Qstd=c++11 !elseif "$(QMAKESPEC)" == "win32-clang-msvc" CXX = clang-cl -LINKER = link +LINKER = lld-link CFLAGS_EXTRA = -fms-compatibility-version=19.00.23506 -Wno-microsoft-enum-value !else CXX = cl |