7ff3032b22
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>
26 lines
687 B
Plaintext
26 lines
687 B
Plaintext
#
|
|
# qmake configuration for win32-g++
|
|
#
|
|
# Written for MinGW-w64 / gcc 5.3 or higher
|
|
#
|
|
# Cross compile example for i686-w64-mingw32-g++:
|
|
# configure -xplatform win32-g++ -device-option CROSS_COMPILE=i686-w64-mingw32-
|
|
#
|
|
|
|
include(../common/g++-win32.conf)
|
|
|
|
# modifications to g++-win32.conf
|
|
|
|
QMAKE_CC = $${CROSS_COMPILE}gcc
|
|
QMAKE_CFLAGS += -fno-keep-inline-dllexport
|
|
QMAKE_CFLAGS_WARN_ON += -Wextra
|
|
|
|
QMAKE_CXX = $${CROSS_COMPILE}g++
|
|
QMAKE_CXXFLAGS += -fno-keep-inline-dllexport
|
|
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
|
|
|
|
QMAKE_LINK = $${CROSS_COMPILE}g++
|
|
QMAKE_LINK_C = $${CROSS_COMPILE}gcc
|
|
|
|
load(qt_config)
|