diff options
| author | Sami Lempinen <sami.lempinen@nokia.com> | 2011-10-03 12:07:49 (GMT) |
|---|---|---|
| committer | Sami Lempinen <sami.lempinen@nokia.com> | 2011-10-03 12:07:49 (GMT) |
| commit | d22211b970dbab1382c97ef8259c91adc2b8a4de (patch) | |
| tree | 8e2a946b25ea187b18777018e19b21e2c5bf9df3 /tests | |
| parent | b4fb55db3939219e976d53c32b42bf28acaa41b1 (diff) | |
| parent | 1f459f4040845919ffd46cea35958486f41abb3c (diff) | |
| download | Qt-d22211b970dbab1382c97ef8259c91adc2b8a4de.zip Qt-d22211b970dbab1382c97ef8259c91adc2b8a4de.tar.gz Qt-d22211b970dbab1382c97ef8259c91adc2b8a4de.tar.bz2 | |
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qaccessibility/tst_qaccessibility.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/qglthreads/tst_qglthreads.cpp | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp index d452820..d24f52f 100644 --- a/tests/auto/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp @@ -2531,6 +2531,12 @@ void tst_QAccessibility::menuTest() QCOMPARE(interface->actionText(QAccessible::DefaultAction, QAccessible::Name, 4), QString()); QCOMPARE(interface->actionText(QAccessible::DefaultAction, QAccessible::Name, 5), QString("Execute")); + // QTBUG-21578 - after setting accessible name on a menu it would no longer + // return the right names for it's children. + QCOMPARE(interface->text(QAccessible::Name, 1), QString("New...")); + file->setAccessibleName("File"); + QCOMPARE(interface->text(QAccessible::Name, 1), QString("New...")); + QAccessibleInterface *iface = 0; QAccessibleInterface *iface2 = 0; diff --git a/tests/auto/qglthreads/tst_qglthreads.cpp b/tests/auto/qglthreads/tst_qglthreads.cpp index 859f47f..60fb10c 100644 --- a/tests/auto/qglthreads/tst_qglthreads.cpp +++ b/tests/auto/qglthreads/tst_qglthreads.cpp @@ -49,6 +49,7 @@ #include <unistd.h> // for usleep #define RUNNING_TIME 2000 // save GPU mem by running shorter time. #else +#include "qplatformdefs.h" // for usleep #define RUNNING_TIME 5000 #endif |