diff options
author | Marc Mutz <marc.mutz@qt.io> | 2024-02-08 11:38:33 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2024-02-08 17:43:59 +0100 |
commit | a5f85926395a59e7f7b505f0d5b4ec46b90addb3 (patch) | |
tree | f28a378c5605b0a69654a142f6966627b8a6dad6 | |
parent | 95feea933bbc67ab4a188470973da3f4df450c3d (diff) |
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 <allan.jensen@qt.io>
-rw-r--r-- | src/corelib/tools/qversionnumber.h | 2 |
1 files changed, 2 insertions, 0 deletions
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 |