Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Revert "Compile fix for MSVC"
  Compile fix for MSVC
  Improve QAccessible for QAccessibleTabBar
  Improve QAccessible for QTabBar
  fix the export macros for the QtDBus module
  rebuild configure.exe
  make "configure -qt-gif" work again on Windows
  Fix a typo in harfbuzz thai line breaking.
  Ensure that font sizes that are > 0 and < 1 are still respected

1 files changed, 6 insertions, 2 deletions

diff --git a/src/plugins/accessible/widgets/complexwidgets.cpp b/src/plugins/accessible/widgets/complexwidgets.cpp
index 8be1560..803786f 100644
--- a/src/plugins/accessible/widgets/complexwidgets.cpp
+++ b/src/plugins/accessible/widgets/complexwidgets.cpp
@@ -1512,10 +1512,14 @@ QString QAccessibleTabBar::text(Text t, int child) const
         default:
             break;
         }
-    } else if (child > 0) {
+    } else {
         switch (t) {
         case Name:
-            return qt_accStripAmp(tabBar()->tabText(child - 1));
+            if (child > 0)
+                return qt_accStripAmp(tabBar()->tabText(child - 1));
+            else if (tabBar()->currentIndex() != -1)
+                return qt_accStripAmp(tabBar()->tabText(tabBar()->currentIndex()));
+            break;
         default:
             break;
         }