Title: [99170] trunk/Source/WebKit2
- Revision
- 99170
- Author
- [email protected]
- Date
- 2011-11-03 05:09:47 -0700 (Thu, 03 Nov 2011)
Log Message
[Qt][WK2] Failing assertion with desktop webview when touch mocking in MinBrowser
https://bugs.webkit.org/show_bug.cgi?id=71452
Reviewed by Andreas Kling.
Don't re-implement touchEvent(), we don't intend to support touch events as we
receive them from the QQuickCanvas at this point.
* UIProcess/API/qt/qdesktopwebview.cpp:
* UIProcess/API/qt/qdesktopwebview.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (99169 => 99170)
--- trunk/Source/WebKit2/ChangeLog 2011-11-03 12:03:55 UTC (rev 99169)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-03 12:09:47 UTC (rev 99170)
@@ -1,5 +1,18 @@
2011-11-03 Simon Hausmann <[email protected]>
+ [Qt][WK2] Failing assertion with desktop webview when touch mocking in MinBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=71452
+
+ Reviewed by Andreas Kling.
+
+ Don't re-implement touchEvent(), we don't intend to support touch events as we
+ receive them from the QQuickCanvas at this point.
+
+ * UIProcess/API/qt/qdesktopwebview.cpp:
+ * UIProcess/API/qt/qdesktopwebview.h:
+
+2011-11-03 Simon Hausmann <[email protected]>
+
[Qt] [WK2] MiniBrowser assert in QtWebProccess on startup in debug build.
https://bugs.webkit.org/show_bug.cgi?id=71196
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp (99169 => 99170)
--- trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp 2011-11-03 12:03:55 UTC (rev 99169)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp 2011-11-03 12:09:47 UTC (rev 99170)
@@ -340,11 +340,6 @@
this->event(event);
}
-void QDesktopWebView::touchEvent(QTouchEvent* event)
-{
- this->event(event);
-}
-
void QDesktopWebView::hoverEnterEvent(QHoverEvent* event)
{
this->event(event);
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h (99169 => 99170)
--- trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h 2011-11-03 12:03:55 UTC (rev 99169)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h 2011-11-03 12:09:47 UTC (rev 99170)
@@ -67,7 +67,6 @@
virtual void mouseReleaseEvent(QMouseEvent *);
virtual void mouseDoubleClickEvent(QMouseEvent *);
virtual void wheelEvent(QWheelEvent*);
- virtual void touchEvent(QTouchEvent*);
virtual void hoverEnterEvent(QHoverEvent*);
virtual void hoverMoveEvent(QHoverEvent*);
virtual void hoverLeaveEvent(QHoverEvent*);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
