Merge branch 'stable' into dev

Conflicts:
	tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp

Change-Id: I6b8d505fc22f052c307ca27f58f7d16f98965f47

1 files changed, 5 insertions, 3 deletions

diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp
index 8cd86dd3f1..84a1668b3c 100644
--- a/src/widgets/widgets/qtabbar.cpp
+++ b/src/widgets/widgets/qtabbar.cpp
@@ -1182,9 +1182,11 @@ void QTabBar::setCurrentIndex(int index)
         d->layoutTab(index);
 #ifndef QT_NO_ACCESSIBILITY
         if (QAccessible::isActive()) {
-            QAccessibleEvent focusEvent(this, QAccessible::Focus);
-            focusEvent.setChild(index);
-            QAccessible::updateAccessibility(&focusEvent);
+            if (hasFocus()) {
+                QAccessibleEvent focusEvent(this, QAccessible::Focus);
+                focusEvent.setChild(index);
+                QAccessible::updateAccessibility(&focusEvent);
+            }
             QAccessibleEvent selectionEvent(this, QAccessible::Selection);
             selectionEvent.setChild(index);
             QAccessible::updateAccessibility(&selectionEvent);