summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2021-01-21 09:58:53 +0100
committerFabian Kosmale <fabian.kosmale@qt.io>2021-01-26 15:55:21 +0100
commit293b7fab55309b59e301c576266d9dabe366b56b (patch)
treefd6b5295b2084e084e5477057dda38a36db7f41e
parent976f28e7bb7cddb11459600f293868abcf7da948 (diff)
Workaround MinGW not handling error suppression macro correctly
Fixes: QTBUG-90353 Change-Id: I9270f4107f3f7083d28228f2426b34bc1e198112 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r--src/corelib/CMakeLists.txt6
1 files changed, 6 insertions, 0 deletions
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"