From a5f85926395a59e7f7b505f0d5b4ec46b90addb3 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 8 Feb 2024 11:38:33 +0100 Subject: [PATCH] QVersionNumber: apply LWG 3346 work-around QtWebEngine builds using GCC 10.2 have hit the GCC < 10.4 problem with containers that define both element_type and value_type, so lift the work-around from QList to QVersionNumber, too. Amends 2188ca2c5df6f21a953c002edbe5b2d2cc2c2d2c. Fixes: QTBUG-122037 Change-Id: Idb59b5325ab6308cfd7d1a5559e45a01a5802099 Reviewed-by: Allan Sandfeld Jensen --- src/corelib/tools/qversionnumber.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/corelib/tools/qversionnumber.h b/src/corelib/tools/qversionnumber.h index 551ce6f5b1..80cf7428c9 100644 --- a/src/corelib/tools/qversionnumber.h +++ b/src/corelib/tools/qversionnumber.h @@ -211,7 +211,9 @@ class QVersionNumber using iterator_category = std::random_access_iterator_tag; using value_type = int; +#ifdef QT_COMPILER_HAS_LWG3346 using element_type = const int; +#endif using difference_type = qptrdiff; // difference to container requirements using size_type = qsizetype; // difference to container requirements using reference = value_type; // difference to container requirements