From 511cb760ee1a35ee1adbb253f5d3f0c16bb91df5 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Fri, 31 Jan 2020 09:46:56 +0100
Subject: qversionnumber.h: Stay compatible with C++11

Avoiding relaxed constexpr support is a small change that doesn't hurt
and it allows us to progress in qtdeclarative without waiting for
general C++17 support in qtbase.

Change-Id: I234276036292346d60d6da3a75bcabbdec9ddde8
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
---
 src/corelib/tools/qversionnumber.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/corelib/tools/qversionnumber.h')

diff --git a/src/corelib/tools/qversionnumber.h b/src/corelib/tools/qversionnumber.h
index 9fd4242859..16058bd04a 100644
--- a/src/corelib/tools/qversionnumber.h
+++ b/src/corelib/tools/qversionnumber.h
@@ -344,30 +344,30 @@ public:
              if_valid_segment_type<Minor> = true>
     static constexpr QTypeRevision fromVersion(Major majorVersion, Minor minorVersion)
     {
-        Q_ASSERT(isValidSegment(majorVersion));
-        Q_ASSERT(isValidSegment(minorVersion));
-        return QTypeRevision(quint8(majorVersion), quint8(minorVersion));
+        return Q_ASSERT(isValidSegment(majorVersion)),
+               Q_ASSERT(isValidSegment(minorVersion)),
+               QTypeRevision(quint8(majorVersion), quint8(minorVersion));
     }
 
     template<typename Major, if_valid_segment_type<Major> = true>
     static constexpr QTypeRevision fromMajorVersion(Major majorVersion)
     {
-        Q_ASSERT(isValidSegment(majorVersion));
-        return QTypeRevision(quint8(majorVersion), SegmentUnknown);
+        return Q_ASSERT(isValidSegment(majorVersion)),
+               QTypeRevision(quint8(majorVersion), SegmentUnknown);
     }
 
     template<typename Minor, if_valid_segment_type<Minor> = true>
     static constexpr QTypeRevision fromMinorVersion(Minor minorVersion)
     {
-        Q_ASSERT(isValidSegment(minorVersion));
-        return QTypeRevision(SegmentUnknown, quint8(minorVersion));
+        return Q_ASSERT(isValidSegment(minorVersion)),
+               QTypeRevision(SegmentUnknown, quint8(minorVersion));
     }
 
     template<typename Integer, if_valid_value_type<Integer> = true>
     static constexpr QTypeRevision fromEncodedVersion(Integer value)
     {
-        Q_ASSERT((value & ~Integer(0xffff)) == Integer(0));
-        return QTypeRevision((value & Integer(0xff00)) >> 8, value & Integer(0xff));
+        return Q_ASSERT((value & ~Integer(0xffff)) == Integer(0)),
+               QTypeRevision((value & Integer(0xff00)) >> 8, value & Integer(0xff));
     }
 
     static constexpr QTypeRevision zero() { return QTypeRevision(0, 0); }
-- 
cgit v1.2.3