[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[tonikitoo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 90edca2ea688903e5c186dd7e94ea9027427fd37
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 19 15:01:26 2009 +0000

    Wrong ifdef combination in QGraphicsWebView's event method.
    
    Patch by Antonio Gomes <tonikitoo at webkit.org> on 2009-10-19
    Reviewed by Tor Arne.
    
    * Api/qgraphicswebview.cpp:
    (QGraphicsWebView::event):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49782 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index 4d7eaf5..7e485a0 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -263,23 +263,26 @@ bool QGraphicsWebView::event(QEvent* event)
                 return true;
             }
             d->page->updatePositionDependentActions(fakeEvent.pos());
-        }
+        } else
 #endif // QT_NO_CONTEXTMENU
+        {
 #ifndef QT_NO_CURSOR
 #if QT_VERSION >= 0x040400
-        } else if (event->type() == QEvent::CursorChange) {
-            // An unsetCursor will set the cursor to Qt::ArrowCursor.
-            // Thus this cursor change might be a QWidget::unsetCursor()
-            // If this is not the case and it came from WebCore, the
-            // QWebPageClient already has set its cursor internally
-            // to Qt::ArrowCursor, so updating the cursor is always
-            // right, as it falls back to the last cursor set by
-            // WebCore.
-            // FIXME: Add a QEvent::CursorUnset or similar to Qt.
-            if (cursor().shape() == Qt::ArrowCursor)
-                d->resetCursor();
+            if (event->type() == QEvent::CursorChange) {
+                // An unsetCursor will set the cursor to Qt::ArrowCursor.
+                // Thus this cursor change might be a QWidget::unsetCursor()
+                // If this is not the case and it came from WebCore, the
+                // QWebPageClient already has set its cursor internally
+                // to Qt::ArrowCursor, so updating the cursor is always
+                // right, as it falls back to the last cursor set by
+                // WebCore.
+                // FIXME: Add a QEvent::CursorUnset or similar to Qt.
+                if (cursor().shape() == Qt::ArrowCursor)
+                    d->resetCursor();
+            }
 #endif
 #endif
+        }
     }
     return QGraphicsWidget::event(event);
 }
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 972839d..1dd7871 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-19  Antonio Gomes  <tonikitoo at webkit.org>
+
+        Reviewed by Tor Arne.
+
+        Wrong ifdef combination in QGraphicsWebView's event method.
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebView::event):
+
+
 2009-10-19  Girish Ramakrishnan  <girish at forwardbias.in>
 
         Reviewed by Holger Freyther.
@@ -168,7 +178,6 @@
         * Api/qgraphicswebview.cpp:
         (QGraphicsWebView::event):
 
->>>>>>> .r49765
 2009-10-13  Girish Ramakrishnan  <girish at forwardbias.in>
 
         Reviewed by Simon Hausmann.

-- 
WebKit Debian packaging