diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-04-26 11:08:23 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-26 11:08:23 +0000 |
| commit | 75d4742e0481d236aba9913768f24b377603f6c6 (patch) | |
| tree | f799474f9dc86fdc12ff5aea28f545e4c58d28fa /src/corelib/thread | |
| parent | 84330007e12122bf1b690a4e68b5ef8e973c7882 (diff) | |
| parent | bb4b86618dc930e0035c5829e336f2606d140ada (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qatomic.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/thread/qatomic.cpp b/src/corelib/thread/qatomic.cpp index 23e816af64..ccb0ee6923 100644 --- a/src/corelib/thread/qatomic.cpp +++ b/src/corelib/thread/qatomic.cpp @@ -1289,7 +1289,7 @@ /*! \fn T *QAtomicPointer::loadAcquire() const - Atomically loads the value of this QAtomicPointerusing the "Acquire" memory + Atomically loads the value of this QAtomicPointer using the "Acquire" memory ordering. The value is not modified in any way, but note that there's no guarantee that it remains so. |