From a2a9639fe503f44820d0c6afae2bec579449f823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?= Date: Thu, 3 Mar 2022 11:11:37 +0200 Subject: 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] Fixes: QTBUG-101411 Fixes: QTBUG-101381 Fixes: QTBUG-101415 Task-number: QTBUG-101384 Task-number: QTBUG-101382 Change-Id: I23158c6ef90c7b4aeeaeeced32214a31acf8f6b1 Reviewed-by: Thiago Macieira (cherry picked from commit 55136998b3fbc3400c2205844d6b19970c18747f) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index a52ae32909..c83ec2640b 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -552,6 +552,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 $<$:-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" -- cgit v1.2.3