diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-11-01 14:36:20 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-03 20:07:04 +0100 |
commit | 7d7b2d4218e048bb599e16b11a3a0625222c6dd9 (patch) | |
tree | e60800025ce546b6fb7700d211e784b3ed67e24a /src/widgets/accessible | |
parent | d2f1c6cd750e0977f5773dd784438a428ce42f33 (diff) |
QtGui: Fix compilation with gcc 4.4
- Do not mix QStringLiteral and Q_TR_NOOP.
- Replace static QString member variables by
- static member functions to return the strings.
- Use tr() since QAccessibleActionInterface declares it.
Acked-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Change-Id: Iabbee8ef61a5d7bfd35978a3f1cce1866329d065
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Diffstat (limited to 'src/widgets/accessible')
-rw-r--r-- | src/widgets/accessible/qaccessiblewidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp index b4613a6eb8..76f96d68ba 100644 --- a/src/widgets/accessible/qaccessiblewidget.cpp +++ b/src/widgets/accessible/qaccessiblewidget.cpp @@ -824,7 +824,7 @@ QStringList QAccessibleWidget::actionNames() const QStringList names; if (widget()->isEnabled()) { if (widget()->focusPolicy() != Qt::NoFocus) - names << SetFocusAction; + names << setFocusAction(); } return names; } @@ -834,7 +834,7 @@ void QAccessibleWidget::doAction(const QString &actionName) if (!widget()->isEnabled()) return; - if (actionName == SetFocusAction) { + if (actionName == setFocusAction()) { if (widget()->isWindow()) widget()->activateWindow(); widget()->setFocus(); |