summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui/accessible/qaccessible.h2
-rw-r--r--src/plugins/accessible/widgets/simplewidgets.cpp8
-rw-r--r--src/plugins/accessible/widgets/simplewidgets.h2
-rw-r--r--tests/auto/other/qaccessibility/tst_qaccessibility.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h
index ff3e910883..d5b0af550e 100644
--- a/src/gui/accessible/qaccessible.h
+++ b/src/gui/accessible/qaccessible.h
@@ -589,7 +589,7 @@ public:
virtual QString imageDescription() const = 0;
virtual QSize imageSize() const = 0;
- virtual QRect imagePosition() const = 0;
+ virtual QPoint imagePosition() const = 0;
};
diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp
index 6c8e4925cd..1dac199a09 100644
--- a/src/plugins/accessible/widgets/simplewidgets.cpp
+++ b/src/plugins/accessible/widgets/simplewidgets.cpp
@@ -474,16 +474,16 @@ QSize QAccessibleDisplay::imageSize() const
}
/*! \internal */
-QRect QAccessibleDisplay::imagePosition() const
+QPoint QAccessibleDisplay::imagePosition() const
{
QLabel *label = qobject_cast<QLabel *>(widget());
if (!label)
- return QRect();
+ return QPoint();
const QPixmap *pixmap = label->pixmap();
if (!pixmap)
- return QRect();
+ return QPoint();
- return QRect(label->mapToGlobal(label->pos()), label->size());
+ return QPoint(label->mapToGlobal(label->pos()));
}
#ifndef QT_NO_GROUPBOX
diff --git a/src/plugins/accessible/widgets/simplewidgets.h b/src/plugins/accessible/widgets/simplewidgets.h
index 66b4c2bd3e..6024788048 100644
--- a/src/plugins/accessible/widgets/simplewidgets.h
+++ b/src/plugins/accessible/widgets/simplewidgets.h
@@ -110,7 +110,7 @@ public:
// QAccessibleImageInterface
QString imageDescription() const Q_DECL_OVERRIDE;
QSize imageSize() const Q_DECL_OVERRIDE;
- QRect imagePosition() const Q_DECL_OVERRIDE;
+ QPoint imagePosition() const Q_DECL_OVERRIDE;
};
#ifndef QT_NO_GROUPBOX
diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
index c4a0d9c76c..73bf4aab6a 100644
--- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
@@ -3295,7 +3295,7 @@ void tst_QAccessibility::labelTest()
QCOMPARE(imageInterface->imageSize(), testPixmap.size());
QCOMPARE(imageInterface->imageDescription(), QString::fromLatin1("Test Description"));
const QPoint labelPos = imageLabel.mapToGlobal(QPoint(0,0));
- QCOMPARE(imageInterface->imagePosition().topLeft(), labelPos);
+ QCOMPARE(imageInterface->imagePosition(), labelPos);
QTestAccessibility::clearEvents();
}