diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
---|---|---|
committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
commit | 440f452aa3a5609e5f6006a03ac36d41462d5908 (patch) | |
tree | 598d682291945055e4f6feb08a228212648482c1 /src/widgets/widgets/qtabbar.cpp | |
parent | cd1e62ffc121cc68c5a133a8095d431f04d966ce (diff) | |
parent | d4959fa6376255ab4adf8adaeb2ee47ae6b679d2 (diff) |
Merge master into api_changes
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/gui/kernel/qplatformsurface_qpa.cpp
tests/auto/corelib/tools/qtimeline/qtimeline.pro
Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178
Diffstat (limited to 'src/widgets/widgets/qtabbar.cpp')
-rw-r--r-- | src/widgets/widgets/qtabbar.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index ecb0ef84e0..2cc573e958 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -359,8 +359,10 @@ void QTabBarPrivate::init() #endif q->setFocusPolicy(Qt::TabFocus); +#ifndef QT_NO_ACCESSIBILITY leftB->setAccessibleName(QTabBar::tr("Scroll Left")); rightB->setAccessibleName(QTabBar::tr("Scroll Right")); +#endif q->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); elideMode = Qt::TextElideMode(q->style()->styleHint(QStyle::SH_TabBar_ElideMode, 0, q)); useScrollButtons = !q->style()->styleHint(QStyle::SH_TabBar_PreferNoArrows, 0, q); @@ -1183,8 +1185,10 @@ void QTabBar::setCurrentIndex(int index) d->layoutTab(index); #ifndef QT_NO_ACCESSIBILITY if (QAccessible::isActive()) { - QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Focus, this, index)); - QAccessible::updateAccessibility(QAccessibleEvent(QAccessible::Selection, this, index)); + QAccessibleEvent focusEvent(QAccessible::Focus, this, index); + QAccessible::updateAccessibility(&focusEvent); + QAccessibleEvent selectionEvent(QAccessible::Selection, this, index); + QAccessible::updateAccessibility(&selectionEvent); } #endif emit currentChanged(index); @@ -1739,7 +1743,7 @@ void QTabBar::mouseMoveEvent(QMouseEvent *event) if (d->pressedIndex != -1 && event->buttons() == Qt::NoButton) d->moveTabFinished(d->pressedIndex); - + // Start drag if (!d->dragInProgress && d->pressedIndex != -1) { if ((event->pos() - d->dragStartPosition).manhattanLength() > QApplication::startDragDistance()) { |