Changeset 846 for trunk/src/plugins/accessible/widgets/simplewidgets.cpp

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/simplewidgets.cpp (modified) (3 diffs)

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)
 {