aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2013-06-10 12:54:36 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-14 11:42:26 +0200
commitf702dfa75ff8817e97f466d18b7c616c38f0d866 (patch)
tree4833f35db36b86a11bfbb23ef403401f5dc5e907 /src
parent2493f9e6cea52c5d293f2170b71cc36af4b82351 (diff)
Fix QQuickTextEdit::hoveredLink
Task-number: QTBUG-31646 Change-Id: Iae4f664ed919f535511f635f2e4ab1006e3c28e5 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src')
-rw-r--r--src/quick/items/qquicktextedit.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp
index 92e81e06cf..4ddef5e355 100644
--- a/src/quick/items/qquicktextedit.cpp
+++ b/src/quick/items/qquicktextedit.cpp
@@ -2510,10 +2510,12 @@ QString QQuickTextEdit::hoveredLink() const
Q_D(const QQuickTextEdit);
if (const_cast<QQuickTextEditPrivate *>(d)->isLinkHoveredConnected()) {
return d->control->hoveredLink();
-#ifndef QT_NO_CURSOR
} else {
- QPointF pos = QCursor::pos(window()->screen()) - window()->position() - mapToScene(position());
+#ifndef QT_NO_CURSOR
+ QPointF pos = QCursor::pos(window()->screen()) - window()->position() - mapToScene(QPointF(0, 0));
return d->control->anchorAt(pos);
+#else
+ return QString();
#endif // QT_NO_CURSOR
}
}