diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-02-23 15:18:57 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-02-24 13:05:05 +0000 |
| commit | 68562989786f2890fb244bbee7de4c7d00ab60ae (patch) | |
| tree | 881522000e94796036a54c8d241096594c2deb5f /tests/auto/accessibility/tst_accessibility.cpp | |
| parent | f0d51ae18393d4aa51ecd13a1c9353167177bea7 (diff) | |
Port from QT_NO_ACCESSIBILITY to QT_CONFIG(accessibility)
Change-Id: I03deebff661746d49e537af5b1c8899b938efb0d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/accessibility/tst_accessibility.cpp')
| -rw-r--r-- | tests/auto/accessibility/tst_accessibility.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/accessibility/tst_accessibility.cpp b/tests/auto/accessibility/tst_accessibility.cpp index 561aa219..4208a366 100644 --- a/tests/auto/accessibility/tst_accessibility.cpp +++ b/tests/auto/accessibility/tst_accessibility.cpp @@ -42,7 +42,7 @@ #include <QtQuickTemplates2/private/qquickpopup_p.h> #include "../shared/util.h" -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include <QtQuick/private/qquickaccessibleattached_p.h> #endif @@ -113,6 +113,7 @@ void tst_accessibility::a11y_data() QTest::newRow("WeekNumberColumn") << "weeknumbercolumn" << 0x0 << "WeekNumberColumn"; //QAccessible::NoRole } +#if QT_CONFIG(accessibility) static QQuickAccessibleAttached *accessibleAttached(QQuickItem *item) { QQuickAccessibleAttached *acc = qobject_cast<QQuickAccessibleAttached *>(qmlAttachedPropertiesObject<QQuickAccessibleAttached>(item, false)); @@ -120,6 +121,7 @@ static QQuickAccessibleAttached *accessibleAttached(QQuickItem *item) acc = item->findChild<QQuickAccessibleAttached *>(); return acc; } +#endif void tst_accessibility::a11y() { @@ -128,7 +130,7 @@ void tst_accessibility::a11y() QFETCH(QString, text); QString fn = name; -#ifdef QT_NO_ACCESSIBILITY +#if !QT_CONFIG(accessibility) if (name == QLatin1Literal("dayofweekrow") || name == QLatin1Literal("monthgrid") || name == QLatin1Literal("weeknumbercolumn")) @@ -149,7 +151,7 @@ void tst_accessibility::a11y() } QVERIFY(item); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QQuickAccessibleAttached *acc = accessibleAttached(item); if (name != QLatin1Literal("dayofweekrow") && name != QLatin1Literal("monthgrid") |