From 293b7fab55309b59e301c576266d9dabe366b56b Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Thu, 21 Jan 2021 09:58:53 +0100 Subject: Workaround MinGW not handling error suppression macro correctly Fixes: QTBUG-90353 Change-Id: I9270f4107f3f7083d28228f2426b34bc1e198112 Reviewed-by: Edward Welbourne Reviewed-by: Kai Koehne Reviewed-by: Volker Hilsheimer --- src/corelib/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 355ba42ee6..66ea5eef79 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -529,6 +529,12 @@ qt_internal_extend_target(Core CONDITION INTEGRITY --pending_instantiations=128 ) +# Workaround for QTBUG-90353 +# Remove if MinGW (our only supported gcc version < 9) is no longer supported +qt_internal_extend_target(Core CONDITION GCC AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9.0.0") + PUBLIC_COMPILE_OPTIONS -Wno-error=invalid-offsetof +) + #### Keys ignored in scope 14:.:.:corelib.pro:pathIsAbsolute(_ss_CMAKE_HOST_DATA_DIR): # CMAKE_HOST_DATA_DIR = "$$[QT_HOST_DATA/src]/" # CMAKE_HOST_DATA_DIR_IS_ABSOLUTE = "True" -- cgit v1.2.3