diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> | 2015-11-05 08:27:56 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-11-05 08:27:56 +0000 |
| commit | d8f41bdc2efa36dd9e2f80e23d7cb4874c019452 (patch) | |
| tree | 254f8c661318ac73ddc128eb06498a8ab4d7babe /src/corelib/plugin/quuid.cpp | |
| parent | f7f55c0b294f03932b205f8eae4335928647f57b (diff) | |
| parent | 4159ee840549df11287294f0928e90f35f3e06ff (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/plugin/quuid.cpp')
| -rw-r--r-- | src/corelib/plugin/quuid.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp index 664d563f51..b7ea1f2f60 100644 --- a/src/corelib/plugin/quuid.cpp +++ b/src/corelib/plugin/quuid.cpp @@ -890,7 +890,7 @@ bool QUuid::operator>(const QUuid &other) const Q_DECL_NOTHROW different variant field, the return value is determined by comparing the two \l{QUuid::Variant} {variants}. - \sa QUuid::variant() + \sa {QUuid::}{variant()} */ /*! @@ -904,7 +904,7 @@ bool QUuid::operator>(const QUuid &other) const Q_DECL_NOTHROW different variant field, the return value is determined by comparing the two \l{QUuid::Variant} {variants}. - \sa QUuid::variant() + \sa {QUuid::}{variant()} */ /*! @@ -996,7 +996,7 @@ QUuid QUuid::createUuid() { int *pseed = new int; static QBasicAtomicInt serial = Q_BASIC_ATOMIC_INITIALIZER(2); - qsrand(*pseed = QDateTime::currentDateTime().toTime_t() + qsrand(*pseed = QDateTime::currentDateTimeUtc().toTime_t() + quintptr(&pseed) + serial.fetchAndAddRelaxed(1)); uuidseed.setLocalData(pseed); @@ -1004,7 +1004,7 @@ QUuid QUuid::createUuid() #else static bool seeded = false; if (!seeded) - qsrand(QDateTime::currentDateTime().toTime_t() + qsrand(QDateTime::currentDateTimeUtc().toTime_t() + quintptr(&seeded)); #endif |