diff --git a/src/corelib/tools/qatomicscopedvaluerollback_p.h b/src/corelib/tools/qatomicscopedvaluerollback_p.h
index 1e2b28125f5..c3b48f8855b 100644
--- a/src/corelib/tools/qatomicscopedvaluerollback_p.h
+++ b/src/corelib/tools/qatomicscopedvaluerollback_p.h
@@ -45,6 +45,24 @@ class QAtomicScopedValueRollback
 #if !defined(Q_CC_GNU_ONLY) || (Q_CC_GNU >= 900)
         // NOLINTNEXTLINE(qt-use-unreachable-return): Triggers on Clang, breaking GCC 8
         Q_UNREACHABLE();
+#endif
+        return std::memory_order_seq_cst;
+    }
+
+    static constexpr std::memory_order load_part(std::memory_order mo) noexcept
+    {
+        switch (mo) {
+        case std::memory_order_relaxed:
+        case std::memory_order_release: return std::memory_order_relaxed;
+        case std::memory_order_consume: return std::memory_order_consume;
+        case std::memory_order_acquire:
+        case std::memory_order_acq_rel: return std::memory_order_acquire;
+        case std::memory_order_seq_cst: return std::memory_order_seq_cst;
+        }
+        // GCC 8.x does not treat __builtin_unreachable() as constexpr
+#if !defined(Q_CC_GNU_ONLY) || (Q_CC_GNU >= 900)
+        // NOLINTNEXTLINE(qt-use-unreachable-return): Triggers on Clang, breaking GCC 8
+        Q_UNREACHABLE();
 #endif
         return std::memory_order_seq_cst;
     }
@@ -56,7 +74,7 @@ public:
     explicit constexpr
     QAtomicScopedValueRollback(std::atomic<T> &var,
                                std::memory_order mo = std::memory_order_seq_cst)
-        : m_atomic(var), m_value(var.load(mo)), m_mo(mo) {}
+        : m_atomic(var), m_value(var.load(load_part(mo))), m_mo(mo) {}
 
     Q_NODISCARD_CTOR
     explicit constexpr
@@ -104,7 +122,7 @@ public:
 
     constexpr void commit()
     {
-        m_value = m_atomic.load(m_mo);
+        m_value = m_atomic.load(load_part(m_mo));
     }
 };