diff options
author | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2022-03-03 11:11:37 +0200 |
---|---|---|
committer | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2022-03-05 22:02:22 +0200 |
commit | 55136998b3fbc3400c2205844d6b19970c18747f (patch) | |
tree | 66f5c0cf89505472f2c524ce153091ab2967b1a7 | |
parent | 1956ca7d70c37c2efb6ff7930843a94aac36be71 (diff) |
Workaround QCC not handling error suppression macro correctly
Fixes also similar warnings from other Qt modules:
warning: offsetof within non-standard-layout type
is conditionally-supported [-Winvalid-offsetof]
Pick-to: 6.2 6.3
Fixes: QTBUG-101411
Fixes: QTBUG-101381
Fixes: QTBUG-101415
Task-number: QTBUG-101384
Task-number: QTBUG-101382
Change-Id: I23158c6ef90c7b4aeeaeeced32214a31acf8f6b1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r-- | src/corelib/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 4a188dd6b8..34980c4c45 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -558,6 +558,12 @@ qt_internal_extend_target(Core CONDITION INTEGRITY --pending_instantiations=128 ) +# Workaround for QTBUG-101411 +# Remove if QCC (gcc version 8.3.0) for QNX 7.1.0 is no longer supported +qt_internal_extend_target(Core CONDITION QCC AND (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL "8.3.0") + PUBLIC_COMPILE_OPTIONS $<$<COMPILE_LANGUAGE:CXX>:-Wno-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" |