Changeset 846 for trunk/src/plugins/accessible/widgets

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/plugins/accessible/widgets/complexwidgets.cpp (modified) (2 diffs)
• src/plugins/accessible/widgets/complexwidgets.h (modified) (1 diff)
• src/plugins/accessible/widgets/main.cpp (modified) (1 diff)
• src/plugins/accessible/widgets/qaccessiblemenu.cpp (modified) (1 diff)
• src/plugins/accessible/widgets/qaccessiblemenu.h (modified) (1 diff)
• src/plugins/accessible/widgets/qaccessiblewidgets.cpp (modified) (4 diffs)
• src/plugins/accessible/widgets/qaccessiblewidgets.h (modified) (1 diff)
• src/plugins/accessible/widgets/rangecontrols.cpp (modified) (1 diff)
• src/plugins/accessible/widgets/rangecontrols.h (modified) (1 diff)
• src/plugins/accessible/widgets/simplewidgets.cpp (modified) (3 diffs)
• src/plugins/accessible/widgets/simplewidgets.h (modified) (1 diff)

trunk/src/plugins/accessible/widgets/complexwidgets.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -1513 +1513 @@
             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;

trunk/src/plugins/accessible/widgets/complexwidgets.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/plugins/accessible/widgets/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/plugins/accessible/widgets/qaccessiblemenu.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/plugins/accessible/widgets/qaccessiblemenu.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/plugins/accessible/widgets/qaccessiblewidgets.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -177 +177 @@
     int minimumDistance = INT_MAX;
     QWidget *target = 0;
-    foreach (QWidget *candidate, candidates.values()) {
+    foreach (QWidget *candidate, candidates) {
         switch (relation) {
         case QAccessible::Up:
@@ -985 +985 @@
 {
     if (child) {
-        if (qobject_cast<QDockWidget *>(child->object()) == dockWidget() && child->role(0) == TitleBar) {
+        if (child->role(0) == TitleBar) {
             return 1;
         } else {
@@ -1215 +1215 @@
 QObject *QAccessibleTitleBar::object() const
 {
-    return m_dockWidget;
+    return 0;
 }
 

trunk/src/plugins/accessible/widgets/qaccessiblewidgets.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/plugins/accessible/widgets/rangecontrols.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/plugins/accessible/widgets/rangecontrols.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/plugins/accessible/widgets/simplewidgets.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -603 +603 @@
 }
 
-/*! \reimp */
+/*! \internal */
 QString QAccessibleDisplay::imageDescription()
 {
+#ifndef QT_NO_TOOLTIP
     return widget()->toolTip();
-}
-
-/*! \reimp */
+#else
+    return QString::null;
+#endif
+}
+
+/*! \internal */
 QSize QAccessibleDisplay::imageSize()
 {
@@ -621 +625 @@
 }
 
-/*! \reimp */
+/*! \internal */
 QRect QAccessibleDisplay::imagePosition(QAccessible2::CoordinateType coordType)
 {

trunk/src/plugins/accessible/widgets/simplewidgets.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)