* Set the cursor on the containingWindow() instead of the

  nativeWidget()
* This should be safe even with plugins as the cursor is set
  on the mouse events.

Signed-Off-By: Lars
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29528 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9d8cad61deb7f37bdbcf8a04266113316c78a90b..356778da627f324f886be3e5f5ea487d91f01b0c 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2008-01-16  Holger Hans Peter Freyther  <holger.freyther@trolltech.com>
+
+        Reviewed by Lars.
+
+        * Set the cursor on the containingWindow() instead of the
+        nativeWidget()
+        * This should be safe even with plugins as the cursor is set
+        on the mouse events.
+
+        * platform/qt/WidgetQt.cpp:
+        (WebCore::Widget::setCursor):
+
 2008-01-16  Brad Hughes  <bhughes@trolltech.com>
 
         Reviewed by Lars.

diff --git a/WebCore/platform/qt/WidgetQt.cpp b/WebCore/platform/qt/WidgetQt.cpp
index 0ecb2f5ffb0fb5561b227024b0507df1af7b3285..f73bc03dfe66fbc00f9c95070f4ecae3c24dbb84 100644 (file)
--- a/WebCore/platform/qt/WidgetQt.cpp
+++ b/WebCore/platform/qt/WidgetQt.cpp
@@ -115,8 +115,8 @@ void Widget::setFocus()
 void Widget::setCursor(const Cursor& cursor)
 {
 #ifndef QT_NO_CURSOR
-    if (data->m_widget)
-        data->m_widget->setCursor(cursor.impl());
+    if (QWidget* widget = containingWindow())
+        widget->setCursor(cursor.impl());
 #endif
 }