diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-31 08:24:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-31 08:24:21 +0200 |
| commit | f510a51dace0cb39a93b057b8fcbcbdda33a956e (patch) | |
| tree | cd1dac8a78ecbb7579c59bf9f0b0d2d6fba56b4a /src/widgets/accessible/simplewidgets.cpp | |
| parent | ccedc853a67da078ace234af7b23fbf861736f3f (diff) | |
| parent | 84830fc07d65d58fce9b24b5ec8f1224b0969ac0 (diff) | |
| download | qtbase-f510a51dace0cb39a93b057b8fcbcbdda33a956e.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I843994939f126ced22f7fe978ec4403f599fc7c9
Diffstat (limited to 'src/widgets/accessible/simplewidgets.cpp')
| -rw-r--r-- | src/widgets/accessible/simplewidgets.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp index 3e01d40de3..bd9f0c6e01 100644 --- a/src/widgets/accessible/simplewidgets.cpp +++ b/src/widgets/accessible/simplewidgets.cpp @@ -404,8 +404,10 @@ QAccessible::Role QAccessibleDisplay::role() const } else if (qobject_cast<QProgressBar*>(object())) { return QAccessible::ProgressBar; #endif +#ifndef QT_NO_STATUSBAR } else if (qobject_cast<QStatusBar*>(object())) { return QAccessible::StatusBar; +#endif } return QAccessibleWidget::role(); } @@ -428,8 +430,10 @@ QString QAccessibleDisplay::text(QAccessible::Text t) const str = doc.toPlainText(); } #endif +#ifndef QT_NO_SHORTCUT if (label->buddy()) str = qt_accStripAmp(str); +#endif #ifndef QT_NO_LCDNUMBER } else if (qobject_cast<QLCDNumber*>(object())) { QLCDNumber *l = qobject_cast<QLCDNumber*>(object()); @@ -438,8 +442,10 @@ QString QAccessibleDisplay::text(QAccessible::Text t) const else str = QString::number(l->intValue()); #endif +#ifndef QT_NO_STATUSBAR } else if (qobject_cast<QStatusBar*>(object())) { return qobject_cast<QStatusBar*>(object())->currentMessage(); +#endif } } break; |