diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-01 17:46:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-01 17:46:58 +0200 |
| commit | fcfd31c9fdd84b234cb9e42b97be62ec18389b61 (patch) | |
| tree | cbaa212790b49e024dae18ecbcead3bbf16a18cf /src/corelib/doc/snippets | |
| parent | 5b739a5b8cfbbedd9265b192d08b346d9b265590 (diff) | |
| parent | 0c5fbd397ceda4d9f0046f1204b5e49229d04312 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
qmake/generators/mac/pbuilder_pbx.cpp
src/corelib/global/qglobal.h
Change-Id: I2c0f7544bf194f2d0f59218fd583c822901487b0
Diffstat (limited to 'src/corelib/doc/snippets')
| -rw-r--r-- | src/corelib/doc/snippets/code/src_corelib_kernel_qsystemsemaphore.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_kernel_qsystemsemaphore.cpp b/src/corelib/doc/snippets/code/src_corelib_kernel_qsystemsemaphore.cpp index 77ec85cc36..e3d76453d0 100644 --- a/src/corelib/doc/snippets/code/src_corelib_kernel_qsystemsemaphore.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_kernel_qsystemsemaphore.cpp @@ -51,8 +51,9 @@ sem.release(2); // resources available == 3 //! [1] QSystemSemaphore sem("market", 5, QSystemSemaphore::Create); -sem.acquire(5); // acquire all 5 resources -sem.release(5); // release the 5 resources +for (int i = 0; i < 5; ++i) // acquire all 5 resources + sem.acquire(); +sem.release(5); // release the 5 resources //! [1] |