diff options
| -rw-r--r-- | tests/auto/qaccessibility/qaccessibility.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qaccessibility/tst_qaccessibility.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/qaccessibility/qaccessibility.pro b/tests/auto/qaccessibility/qaccessibility.pro index 71d6f95..af21d7c 100644 --- a/tests/auto/qaccessibility/qaccessibility.pro +++ b/tests/auto/qaccessibility/qaccessibility.pro @@ -2,6 +2,8 @@ load(qttest_p4) requires(contains(QT_CONFIG,accessibility)) SOURCES += tst_qaccessibility.cpp +linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC # QTBUG-26499 + unix:!mac:LIBS+=-lm contains(QT_CONFIG, qt3support): QT += qt3support diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp index d20899f..ed69901 100644 --- a/tests/auto/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp @@ -2744,7 +2744,7 @@ void tst_QAccessibility::textEditTest() QCOMPARE(iface->text(QAccessible::Value, 6), QString()); QCOMPARE(iface->textInterface()->characterCount(), 31); QFontMetrics fm(edit.font()); -#ifdef Q_WS_X11 +#if defined(Q_WS_X11) && defined(UBUNTU_ONEIRIC) QEXPECT_FAIL("", "QTBUG-26499", Abort); #endif QCOMPARE(iface->textInterface()->characterRect(0, QAccessible2::RelativeToParent).size(), QSize(fm.width("h"), fm.height())); |