diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 19:22:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 19:22:37 (GMT) |
| commit | 2b78291003543d45d176424d6d9624d0c02c273c (patch) | |
| tree | ab21561d2ca288b7b52f8e4d3ab757b50f2ede06 /src/plugins/accessible | |
| parent | 50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5 (diff) | |
| parent | c7afbc97d4cb60ed11996d0bcbbddaac2b18d18c (diff) | |
| download | Qt-2b78291003543d45d176424d6d9624d0c02c273c.zip Qt-2b78291003543d45d176424d6d9624d0c02c273c.tar.gz Qt-2b78291003543d45d176424d6d9624d0c02c273c.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/plugins/accessible')
| -rw-r--r-- | src/plugins/accessible/widgets/simplewidgets.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp index d8b57af..eb6a909 100644 --- a/src/plugins/accessible/widgets/simplewidgets.cpp +++ b/src/plugins/accessible/widgets/simplewidgets.cpp @@ -602,7 +602,7 @@ int QAccessibleDisplay::navigate(RelationFlag rel, int entry, QAccessibleInterfa return QAccessibleWidgetEx::navigate(rel, entry, target); } -/*! \reimp */ +/*! \internal */ QString QAccessibleDisplay::imageDescription() { #ifndef QT_NO_TOOLTIP @@ -612,7 +612,7 @@ QString QAccessibleDisplay::imageDescription() #endif } -/*! \reimp */ +/*! \internal */ QSize QAccessibleDisplay::imageSize() { QLabel *label = qobject_cast<QLabel *>(widget()); @@ -624,7 +624,7 @@ QSize QAccessibleDisplay::imageSize() return pixmap->size(); } -/*! \reimp */ +/*! \internal */ QRect QAccessibleDisplay::imagePosition(QAccessible2::CoordinateType coordType) { QLabel *label = qobject_cast<QLabel *>(widget()); |