diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-02-17 20:31:38 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-17 20:31:38 +0100 |
| commit | e88011357e5dd3b0ae4e6bc715ef29e5f4f3ffab (patch) | |
| tree | c5b05d45e49194d70ff4defae41e5d5d5cf75e80 /tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp | |
| parent | 2df8884bc68343ad96962e7496b98d6e585c0347 (diff) | |
| parent | e65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp')
| -rw-r--r-- | tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp b/tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp index 02f99b08d3..3583c1cab3 100644 --- a/tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp +++ b/tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp @@ -491,7 +491,7 @@ void tst_QSharedMemory::useTooMuchMemory() QVERIFY(sm->data() == 0); if (sm->error() != QSharedMemory::OutOfResources) qDebug() << sm->error() << sm->errorString(); - // ### Linux wont return OutOfResources if there are not enough semaphores to use. + // ### Linux won't return OutOfResources if there are not enough semaphores to use. QVERIFY(sm->error() == QSharedMemory::OutOfResources || sm->error() == QSharedMemory::LockError); QVERIFY(sm->errorString() != QString()); |