diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-20 01:00:50 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-20 01:00:51 +0100 |
| commit | 1315133233785f8d0b6b3e9c0967e131b9b322f9 (patch) | |
| tree | 30686773241f619ebab1d4de88053f49ac6b01d4 /qmake | |
| parent | b10e1209e1c3655ee6e57185bb5375408ce02e56 (diff) | |
| parent | 315c2c468e504b83d616e2068bd4f7688ff58cf7 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ic4ffd206bdd3ed68fd3d21a93818923e8d3a1e7a
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.win32 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 74fb80e337..ab49113fc7 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -13,7 +13,7 @@ QMKSRC = $(SOURCE_PATH)\qmake !if "$(QMAKESPEC)" == "win32-icc" CXX = icl LINKER = xilink -CFLAGS_EXTRA = /Zc:forScope /Qstd=c++11 /O3 +CFLAGS_EXTRA = /Zc:forScope /Qstd=c++11 !elseif "$(QMAKESPEC)" == "win32-clang-msvc" CXX = clang-cl LINKER = lld-link |