From 96c5792d5bd4714c3700ce77cd9d9ffea56ae9dc Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 7 Jan 2025 18:52:26 +0100 Subject: [PATCH] QUuid: mark Version::UnixEpoch as since 6.9 ... because it is. Amends d89cef439f5c1a58aeff879a12d9a33292764b7f. Change-Id: I82cfb386c058a0dda873022377ec91368c71e026 Reviewed-by: Thiago Macieira (cherry picked from commit 4af8a20e8e0384d3de4af6c2b47a0783ba28bbc3) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/plugin/quuid.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp index e0d621dec80..a28706d65d6 100644 --- a/src/corelib/plugin/quuid.cpp +++ b/src/corelib/plugin/quuid.cpp @@ -882,8 +882,8 @@ QDataStream &operator>>(QDataStream &s, QUuid &id) \value Md5 Alias for Name \value Random Random-based, by using random numbers for all sections \value Sha1 Name-based version that uses SHA-1 hashing - \value UnixEpoch Time-based UUID using the number of milliseconds since - the UNIX epoch + \value UnixEpoch [since 6.9] Time-based UUID using the number of + milliseconds since the UNIX epoch */ /*!