diff options
| author | J-P Nurmi <jpnurmi@gmail.com> | 2013-06-18 09:54:24 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-23 11:17:36 +0200 |
| commit | e1fc2793aef53b84a3f1e19b6d6bdf1141340074 (patch) | |
| tree | d2c59fc983c5e1b8eea43c6590379b2dfc225121 | |
| parent | 2402d3a303f712f4402cc258fcd7c8983227ea31 (diff) | |
Add missing null check to QQuickTextEdit::hoveredLink()
Change-Id: Ie0cb144bb5596f566584b8bb80e334983dd2b50e
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| -rw-r--r-- | src/quick/items/qquicktextedit.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 4ddef5e355..6e2262831d 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -2512,12 +2512,13 @@ QString QQuickTextEdit::hoveredLink() const return d->control->hoveredLink(); } else { #ifndef QT_NO_CURSOR - QPointF pos = QCursor::pos(window()->screen()) - window()->position() - mapToScene(QPointF(0, 0)); - return d->control->anchorAt(pos); -#else - return QString(); + if (QQuickWindow *wnd = window()) { + QPointF pos = QCursor::pos(wnd->screen()) - wnd->position() - mapToScene(QPointF(0, 0)); + return d->control->anchorAt(pos); + } #endif // QT_NO_CURSOR } + return QString(); } void QQuickTextEdit::hoverEnterEvent(QHoverEvent *event) |