From 0ff26fde8531cc58b2e47cfcc768b72a55f766f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?= Date: Fri, 4 Mar 2022 12:10:43 +0000 Subject: Revert "Workaround MinGW not handling error suppression macro correctly" This reverts commit 293b7fab55309b59e301c576266d9dabe366b56b. Reason for revert: Since Qt 6.2 MinGW 8.1 is not anymore supported Change-Id: I9b2e5e08bee663d5289a69218493911544671e79 Reviewed-by: Fabian Kosmale (cherry picked from commit e0023ae353a7c208ce0300466955036a117370c8) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/CMakeLists.txt | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src') diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 525ca89f42..a52ae32909 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -552,12 +552,6 @@ 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