diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-09-07 16:36:49 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-09-07 16:36:49 (GMT) |
| commit | 415ad7b69d364c41156d35b98790b02667a6671b (patch) | |
| tree | 759b02134da808773a1d68eecf2eb5c0ff12167c /src/3rdparty/webkit/WebKit | |
| parent | 3c18c2a43260a271f8a13e89053eede15d399005 (diff) | |
| parent | 703d85e8991e2061062f6d7c695cdeb45d9661fd (diff) | |
| download | Qt-415ad7b69d364c41156d35b98790b02667a6671b.zip Qt-415ad7b69d364c41156d35b98790b02667a6671b.tar.gz Qt-415ad7b69d364c41156d35b98790b02667a6671b.tar.bz2 | |
Merge branch '4.7' into qmldocs
Diffstat (limited to 'src/3rdparty/webkit/WebKit')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp index 67ce708..94f08bd 100644 --- a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp @@ -91,7 +91,6 @@ GraphicsWebView::GraphicsWebView(QDeclarativeWebView* parent) void GraphicsWebView::mousePressEvent(QGraphicsSceneMouseEvent* event) { - setFocus(); pressPoint = event->pos(); if (pressTime) { pressTimer.start(pressTime, this); @@ -101,6 +100,11 @@ void GraphicsWebView::mousePressEvent(QGraphicsSceneMouseEvent* event) parent->setKeepMouseGrab(true); } QGraphicsWebView::mousePressEvent(event); + + QWebHitTestResult hit = page()->mainFrame()->hitTestContent(pressPoint.toPoint()); + if (hit.isContentEditable()) + parent->forceActiveFocus(); + setFocus(); } void GraphicsWebView::mouseReleaseEvent(QGraphicsSceneMouseEvent* event) |