Changeset 57897 in webkit

Timestamp:

Apr 20, 2010 10:41:45 AM (14 years ago)

Author:

Simon Hausmann

Message:

[Qt] Multitouch mocking in QtLauncher doesn't work with QGraphicsView
​https://bugs.webkit.org/show_bug.cgi?id=37816

Patch by Kim Grönholm <​kim.gronholm@nomovok.com> on 2010-04-20
Reviewed by Simon Hausmann.

Fix multi-touch mocking in QtLauncher when using QGraphicsView.
Test: ​https://bug-32434-attachments.webkit.org/attachment.cgi?id=44955

• QtLauncher/main.cpp:

(LauncherWindow::eventFilter):
(LauncherWindow::initializeView):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QtLauncher/main.cpp (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-20  Kim Grönholm  <kim.gronholm@nomovok.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Multitouch mocking in QtLauncher doesn't work with QGraphicsView
+        https://bugs.webkit.org/show_bug.cgi?id=37816
+        
+        Fix multi-touch mocking in QtLauncher when using QGraphicsView.
+        Test: https://bug-32434-attachments.webkit.org/attachment.cgi?id=44955
+
+        * QtLauncher/main.cpp:
+        (LauncherWindow::eventFilter):
+        (LauncherWindow::initializeView):
+
 2010-04-20  MORITA Hajime <morrita@google.com>
 

trunk/WebKitTools/QtLauncher/main.cpp

@@ -365 +365 @@
 
 #if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
-    if (!m_touchMocking || obj != m_view)
+    if (!m_touchMocking)
         return QObject::eventFilter(obj, event);
 
@@ -635 +635 @@
         connect(view, SIGNAL(currentFPSUpdated(int)), this, SLOT(updateFPS(int)));
 
+        view->installEventFilter(this);
         // The implementation of QAbstractScrollArea::eventFilter makes us need
-        // to install the event filter on the viewport of a QGraphicsView.
+        // to install the event filter also on the viewport of a QGraphicsView.
         view->viewport()->installEventFilter(this);