diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-15 18:12:04 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-15 18:14:13 +0100 |
commit | 270a51b7758794d47d5ffb892c35989a87b90628 (patch) | |
tree | c2b8b7728619a3d690978e07dd94cced48d4d9f2 /tests | |
parent | cd7ba89a07f794b17fc66ba29515b104c4d21f27 (diff) | |
parent | 4cad9e466784ec54e3cf6f216d3df20ba7a595b0 (diff) |
Merge remote-tracking branch 'gerrit/release' into stable
Change-Id: Ieb104d0e390218a063082c93bc9c7e412af2166d
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(); |