[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
hausmann at webkit.org
hausmann at webkit.org
Tue Jan 5 23:53:34 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit a76ebce40820c1a6985211eeaa7066fee52cb4d0
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 18 13:32:53 2009 +0000
[Qt] Fix infinite recursion in touch mocking.
Reviewed by Tor Arne Vestbø.
Don't send the fake touch events to the view, as that'll trigger the
event filter again.
* QtLauncher/main.cpp:
(MainWindow::sendTouchEvent):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52307 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index f6836d9..15eb7b4 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-18 Simon Hausmann <simon.hausmann at nokia.com>
+
+ Reviewed by Tor Arne Vestbø.
+
+ [Qt] Fix infinite recursion in touch mocking.
+
+ Don't send the fake touch events to the view, as that'll trigger the
+ event filter again.
+
+ * QtLauncher/main.cpp:
+ (MainWindow::sendTouchEvent):
+
2009-12-17 Benjamin Poulain <benjamin.poulain at nokia.com>
Reviewed by Simon Hausmann.
diff --git a/WebKit/qt/QtLauncher/main.cpp b/WebKit/qt/QtLauncher/main.cpp
index 88d17d5..04d61bf 100644
--- a/WebKit/qt/QtLauncher/main.cpp
+++ b/WebKit/qt/QtLauncher/main.cpp
@@ -242,7 +242,7 @@ public:
QTouchEvent touchEv(type);
touchEv.setTouchPoints(touchPoints);
- QCoreApplication::sendEvent(view, &touchEv);
+ QCoreApplication::sendEvent(view->page(), &touchEv);
// After sending the event, remove all touchpoints that were released
if (touchPoints[0].state() == Qt::TouchPointReleased)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list