summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPasi Petäjäjärvi <pasi.petajajarvi@qt.io>2022-03-04 12:10:43 +0000
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-03-05 09:04:26 +0000
commit0ff26fde8531cc58b2e47cfcc768b72a55f766f6 (patch)
tree5a89f9d886e82338610793d476487a19f324828c
parentaab33030a5ed163e4a8d3e6222b414b79334f32a (diff)
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 <fabian.kosmale@qt.io> (cherry picked from commit e0023ae353a7c208ce0300466955036a117370c8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/corelib/CMakeLists.txt6
1 files changed, 0 insertions, 6 deletions
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"