Changeset 69110 in webkit

Timestamp:

Oct 5, 2010, 8:44:57 AM (15 years ago)

Author:

jpetsovits@rim.com

Message:

2010-10-05 Jakob Petsovits <​jpetsovits@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):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/qt/CursorQt.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-05  Jakob Petsovits  <jpetsovits@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@apple.com>
 

trunk/WebCore/platform/qt/CursorQt.cpp

@@ -73 +73 @@
 }
 
+#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