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

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the webkit-1.1 branch:
commit d6e83d8272bd55811883065c364c14deecf880e4
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 2 15:49:27 2009 +0000

    2009-10-02  Norbert Leser  <norbert.leser at nokia.com>
    
            Reviewed by Simon Hausmann.
    
            Conditionally guard cursor code (cursor and updateCursor functions) with !QT_NO_CURSOR.
            Otherwise, it is inconsistent with class declaration of QCursor.
    
            * Api/qgraphicswebview.cpp:
            * Api/qwebview.cpp:
    
    
    2009-10-02  Norbert Leser  <norbert.leser at nokia.com>
    
            Reviewed by Simon Hausmann.
    
            Conditionally guard cursor code (cursor and updateCursor functions) with !QT_NO_CURSOR.
            Otherwise, it is inconsistent with class declaration of QCursor.
    
            No new tests.
    
            * platform/qt/QWebPageClient.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49023 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 96c8c64..3c1f755 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-02  Norbert Leser  <norbert.leser at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Conditionally guard cursor code (cursor and updateCursor functions) with !QT_NO_CURSOR.
+        Otherwise, it is inconsistent with class declaration of QCursor.
+
+        No new tests.
+
+        * platform/qt/QWebPageClient.h:
+
 2009-10-02  Philippe Normand  <pnormand at igalia.com>
 
         Reviewed by Gustavo Noronha.
diff --git a/WebCore/platform/qt/QWebPageClient.h b/WebCore/platform/qt/QWebPageClient.h
index 1fc29a0..b62985e 100644
--- a/WebCore/platform/qt/QWebPageClient.h
+++ b/WebCore/platform/qt/QWebPageClient.h
@@ -35,28 +35,36 @@ public:
 
     inline void resetCursor()
     {
+#ifndef QT_NO_CURSOR
         if (!cursor().bitmap() && cursor().shape() == m_lastCursor.shape())
             return;
         updateCursor(m_lastCursor);
+#endif
     }
 
     inline void setCursor(const QCursor& cursor)
     {
+#ifndef QT_NO_CURSOR
         m_lastCursor = cursor;
         if (!cursor.bitmap() && cursor.shape() == this->cursor().shape())
             return;
         updateCursor(cursor);
+#endif
     }
 
     virtual int screenNumber() const = 0;
     virtual WId winId() const = 0;
 
 protected:
+#ifndef QT_NO_CURSOR
     virtual QCursor cursor() const = 0;
     virtual void updateCursor(const QCursor& cursor) = 0;
+#endif
 
 private:
+#ifndef QT_NO_CURSOR
     QCursor m_lastCursor;
+#endif
 };
 
 #endif
diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index d8d9d64..d7580c9 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -45,8 +45,10 @@ public:
     virtual void scroll(int dx, int dy, const QRect&);
     virtual void update(const QRect& dirtyRect);
 
+#ifndef QT_NO_CURSOR
     virtual QCursor cursor() const;
     virtual void updateCursor(const QCursor& cursor);
+#endif
 
     virtual int screenNumber() const;
     virtual WId winId() const;
@@ -95,6 +97,7 @@ void QGraphicsWebViewPrivate::update(const QRect & dirtyRect)
     q->update(QRectF(dirtyRect));
 }
 
+#ifndef QT_NO_CURSOR
 QCursor QGraphicsWebViewPrivate::cursor() const
 {
     return q->cursor();
@@ -104,6 +107,7 @@ void QGraphicsWebViewPrivate::updateCursor(const QCursor& cursor)
 {
     q->setCursor(cursor);
 }
+#endif
 
 int QGraphicsWebViewPrivate::screenNumber() const
 {
diff --git a/WebKit/qt/Api/qwebview.cpp b/WebKit/qt/Api/qwebview.cpp
index c7515ab..f90fc2a 100644
--- a/WebKit/qt/Api/qwebview.cpp
+++ b/WebKit/qt/Api/qwebview.cpp
@@ -48,8 +48,10 @@ public:
     virtual void scroll(int dx, int dy, const QRect&);
     virtual void update(const QRect& dirtyRect);
 
+#ifndef QT_NO_CURSOR
     virtual QCursor cursor() const;
     virtual void updateCursor(const QCursor& cursor);
+#endif
 
     virtual int screenNumber() const;
     virtual WId winId() const;
@@ -72,6 +74,7 @@ void QWebViewPrivate::update(const QRect & dirtyRect)
     view->update(dirtyRect);
 }
 
+#ifndef QT_NO_CURSOR
 QCursor QWebViewPrivate::cursor() const
 {
     return view->cursor();
@@ -81,6 +84,7 @@ void QWebViewPrivate::updateCursor(const QCursor& cursor)
 {
     view->setCursor(cursor);
 }
+#endif
 
 int QWebViewPrivate::screenNumber() const
 {
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index ab12aef..7005916 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-02  Norbert Leser  <norbert.leser at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Conditionally guard cursor code (cursor and updateCursor functions) with !QT_NO_CURSOR.
+        Otherwise, it is inconsistent with class declaration of QCursor.
+
+        * Api/qgraphicswebview.cpp:
+        * Api/qwebview.cpp:
+
 2009-10-02  Prasanth Ullattil  <prasanth.ullattil at nokia.com>
 
         Reviewed by Simon Hausmann.

-- 
WebKit Debian packaging