diff options
| author | Alexander Shevchenko <sav_ix@ukr.net> | 2018-02-22 20:28:37 +0200 |
|---|---|---|
| committer | Alexander Shevchenko <sav_ix@ukr.net> | 2018-02-22 18:45:15 +0000 |
| commit | 7ff3032b22cacd38390d164cb2c1a232c1979bab (patch) | |
| tree | a54fb42d231957336609735cf5769643177e8045 /mkspecs/win32-clang-msvc | |
| parent | 17b73b0d2b8e0d643bdf13b543cc23d657a4b330 (diff) | |
unify windows mkspecs: define c++ flags explicitly
with 40e87491 merged, 'QMAKE_CXXFLAGS' variable in
'win32-g++' toolchain became defined via 'QMAKE_CFLAGS'.
the similar can be found in 'win32-clang-msvc' and
'win32-icc' toolchains too.
this works for now, because such definitions just duplicates code
from includes, like 'gcc-base.conf', 'msvc-desktop.conf', etc.
but it would became broken, if changes would be applied to
'QMAKE_CXXFLAGS' definitions in that includes, prior
to the redefinitions in 'win32-*/qmake.conf' toolchains.
thus 'QMAKE_CXXFLAGS' definitions in 'win32-*/qmake.conf' toolchains
should not depend on 'QMAKE_CFLAGS' and be done explicitly.
in order to apply this change correctly to 'win32-icc' toolchain,
its 'QMAKE_CFLAGS' variable should become dependent on definitions
in the includes, similar to 'win32-clang-msvc' and
'win32-msvc' toolchains.
Change-Id: I5e820e44a769a590ba63f70dcb3a115311093311
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs/win32-clang-msvc')
| -rw-r--r-- | mkspecs/win32-clang-msvc/qmake.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/win32-clang-msvc/qmake.conf b/mkspecs/win32-clang-msvc/qmake.conf index 0041788ef9..ba9704e069 100644 --- a/mkspecs/win32-clang-msvc/qmake.conf +++ b/mkspecs/win32-clang-msvc/qmake.conf @@ -12,7 +12,8 @@ QMAKE_CC = clang-cl QMAKE_CXX = $$QMAKE_CC QMAKE_CFLAGS += -Wno-microsoft-enum-value -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS + +QMAKE_CXXFLAGS += -Wno-microsoft-enum-value # Precompiled headers are not supported yet by clang CONFIG -= precompile_header |