From 7ff3032b22cacd38390d164cb2c1a232c1979bab Mon Sep 17 00:00:00 2001 From: Alexander Shevchenko Date: Thu, 22 Feb 2018 20:28:37 +0200 Subject: 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 --- mkspecs/win32-msvc/qmake.conf | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'mkspecs/win32-msvc/qmake.conf') diff --git a/mkspecs/win32-msvc/qmake.conf b/mkspecs/win32-msvc/qmake.conf index 5c38330add..08f085127a 100644 --- a/mkspecs/win32-msvc/qmake.conf +++ b/mkspecs/win32-msvc/qmake.conf @@ -5,4 +5,9 @@ # include(../common/msvc-desktop.conf) + +QMAKE_CFLAGS += + +QMAKE_CXXFLAGS += + load(qt_config) -- cgit v1.2.3