2011-02-10 Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
authorAdemar de Souza Reis Jr <ademar.reis@openbossa.org>
Mon, 14 Feb 2011 17:56:44 +0000 (14:56 -0300)
committerAdemar de Souza Reis Jr <ademar.reis@openbossa.org>
Wed, 16 Feb 2011 19:51:44 +0000 (16:51 -0300)
commitdc72f200c3feec9f06b62bfa74f6be0dfb93464c
treedbc30d155c2e771744fa9d628f7b955c8ce4c18e
parentc60775d44b56a65c60131b131c001ad3a465b74e
2011-02-10  Ademar de Souza Reis Jr  <ademar.reis@openbossa.org>

        Reviewed by Andreas Kling.

        [Qt] Ensure WebView press delay timer is cancelled when grab is taken
        https://bugs.webkit.org/show_bug.cgi?id=54242

        As reported in:
        http://bugreports.qt.nokia.com/browse/QTBUG-15529

        Flickable steals the grab, but the timer was not stopped and the
        keepGrab flag is set and the mouse grabbed. This means that the WebView
        now has the grab and subsequent clicks on another element are ignored.

        Original patch from Martin Jones <martin.jones@nokia.com>
        reviewed (there) by Joona Petrell
        52068f57f9c32098a90cc217730a530f85590f65

        * declarative/qdeclarativewebview.cpp:
        (GraphicsWebView::sceneEvent):
        * declarative/qdeclarativewebview_p.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@78270 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Conflicts:

Source/WebKit/qt/ChangeLog
Source/WebKit/qt/declarative/qdeclarativewebview.cpp
WebKit/qt/ChangeLog
WebKit/qt/declarative/qdeclarativewebview.cpp
WebKit/qt/declarative/qdeclarativewebview_p.h