[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[jpetsovits at rim.com]

The following commit has been merged in the debian/experimental branch:
commit d7fdfc2b57536db6ba94694e8cc4e91fb928791a
Author: jpetsovits at rim.com <jpetsovits at rim.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 15:44:57 2010 +0000

    2010-10-05  Jakob Petsovits  <jpetsovits at rim.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] Make build work with QT_NO_CURSOR
            https://bugs.webkit.org/show_bug.cgi?id=46097
    
            createCustomCursor() is a static function and not used
            in that file if QT_NO_CURSOR is defined, so rather than
            making it return 0, it should not exist altogether.
    
            * platform/qt/CursorQt.cpp:
            (WebCore::createCustomCursor):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69110 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ef29e2c..6addb9f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-05  Jakob Petsovits  <jpetsovits at rim.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Make build work with QT_NO_CURSOR
+        https://bugs.webkit.org/show_bug.cgi?id=46097
+
+        createCustomCursor() is a static function and not used
+        in that file if QT_NO_CURSOR is defined, so rather than
+        making it return 0, it should not exist altogether.
+
+        * platform/qt/CursorQt.cpp:
+        (WebCore::createCustomCursor):
+
 2010-10-05  Adam Roben  <aroben at apple.com>
 
         Windows linker warning fix
diff --git a/WebCore/platform/qt/CursorQt.cpp b/WebCore/platform/qt/CursorQt.cpp
index 227b80c..5883600 100644
--- a/WebCore/platform/qt/CursorQt.cpp
+++ b/WebCore/platform/qt/CursorQt.cpp
@@ -72,15 +72,13 @@ Cursor& Cursor::operator=(const Cursor& other)
     return *this;
 }
 
+#ifndef QT_NO_CURSOR
 static QCursor* createCustomCursor(Image* image, const IntPoint& hotSpot)
 {
-#ifndef QT_NO_CURSOR
     IntPoint effectiveHotSpot = determineHotSpot(image, hotSpot);
     return new QCursor(*(image->nativeImageForCurrentFrame()), effectiveHotSpot.x(), effectiveHotSpot.y());
-#else
-    return 0;
-#endif
 }
+#endif
 
 void Cursor::ensurePlatformCursor() const
 {

-- 
WebKit Debian packaging