diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-15 18:23:19 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-15 19:47:44 +0100 |
| commit | 122ee7a367bc379c7b93b82118d2ac8f10068986 (patch) | |
| tree | 097b576eb975e6da13de024191070260c5e9817b /tests | |
| parent | c1b974c611f963c8f46bdea0aada1b7f6565fc56 (diff) | |
| parent | 270a51b7758794d47d5ffb892c35989a87b90628 (diff) | |
Merge "Merge remote-tracking branch 'gerrit/release' into stable" into refs/staging/stable
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/other/qaccessibility/tst_qaccessibility.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp b/tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp index c7c75947ad..baeb6e1666 100644 --- a/tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp +++ b/tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp @@ -210,7 +210,7 @@ int tst_QSharedMemory::remove(const QString &key) return -3; } - int id = shmget(unix_key, 0, 0660); + int id = shmget(unix_key, 0, 0600); if (-1 == id) { qDebug() << "shmget failed" << strerror(errno); return -4; diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp index 7e25684bff..acb072bf6d 100644 --- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp @@ -3254,7 +3254,7 @@ void tst_QAccessibility::bridgeTest() ia2TableCell->Release(); ia2Table->Release(); #endif - iaccTextEdit->Release(); + iaccTable->Release(); } iaccWindow->Release(); |