Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (210 commits)
  QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5
  DEF file updates for Symbian
  QTBUG-19883 Adding top level TRAP for QThreads on Symbian
  Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread"
  Fix alignment value not handled in ODF
  Silence a compiler warning about unhandled enum in switch
  Silence the "array out of bounds" warning in GCC 4.6.
  Silence the callgrind warnings in our source code when using gcc 4.6
  Create a function that merges the SSE common code
  Improve toLatin1 x86 SIMD by using a new SSE4.1 instruction
  Revert "Fix compilation of lrelease on Windows"
  QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread
  Also test http proxy in the QTcpServer benchmark
  Symbian QFileSystemWatcher: fix potential crash
  Enable QTcpServer benchmark on symbian
  Fix building the OpenVG graphicssystem on Linux with static libs
  fix build on windows 7
  Fix compilation of lrelease on Windows
  Allow selecting fonts with irregular style names
  Fix missing empty lines in Qt HTML when displayed in compliant browsers
  ...

1 files changed, 0 insertions, 18 deletions

diff --git a/src/plugins/accessible/widgets/rangecontrols.cpp b/src/plugins/accessible/widgets/rangecontrols.cpp
index fb53b10..8868d53 100644
--- a/src/plugins/accessible/widgets/rangecontrols.cpp
+++ b/src/plugins/accessible/widgets/rangecontrols.cpp
@@ -83,8 +83,6 @@ QAbstractSpinBox *QAccessibleAbstractSpinBox::abstractSpinBox() const
 /*! \reimp */
 int QAccessibleAbstractSpinBox::childCount() const
 {
-    if (!abstractSpinBox()->isVisible())
-        return 0;
     return ValueDown;
 }
 
@@ -344,8 +342,6 @@ QDoubleSpinBox *QAccessibleDoubleSpinBox::doubleSpinBox() const
 /*! \reimp */
 int QAccessibleDoubleSpinBox::childCount() const
 {
-    if (!doubleSpinBox()->isVisible())
-        return 0;
     return ValueDown;
 }
 
@@ -410,8 +406,6 @@ QVariant QAccessibleDoubleSpinBox::invokeMethodEx(QAccessible::Method, int, cons
 /*! \reimp */
 QString QAccessibleDoubleSpinBox::text(Text textType, int child) const
 {
-    if (!doubleSpinBox()->isVisible())
-        return QString();
     switch (textType) {
     case Name:
         if (child == ValueUp)
@@ -540,16 +534,12 @@ QRect QAccessibleScrollBar::rect(int child) const
 /*! \reimp */
 int QAccessibleScrollBar::childCount() const
 {
-    if (!scrollBar()->isVisible())
-        return 0;
     return LineDown;
 }
 
 /*! \reimp */
 QString QAccessibleScrollBar::text(Text t, int child) const
 {
-    if (!scrollBar()->isVisible())
-        return QString();
     switch (t) {
     case Value:
         if (!child || child == Position)
@@ -698,16 +688,12 @@ QRect QAccessibleSlider::rect(int child) const
 /*! \reimp */
 int QAccessibleSlider::childCount() const
 {
-    if (!slider()->isVisible())
-        return 0;
     return PageRight;
 }
 
 /*! \reimp */
 QString QAccessibleSlider::text(Text t, int child) const
 {
-    if (!slider()->isVisible())
-        return QString();
     switch (t) {
     case Value:
         if (!child || child == 2)
@@ -932,15 +918,11 @@ QRect QAccessibleDial::rect(int child) const
 
 int QAccessibleDial::childCount() const
 {
-    if (!dial()->isVisible())
-        return 0;
     return SliderHandle;
 }
 
 QString QAccessibleDial::text(Text textType, int child) const
 {
-    if (!dial()->isVisible())
-        return QString();
     if (textType == Value && child >= Self && child <= SliderHandle)
         return QString::number(dial()->value());
     if (textType == Name) {