2010-04-28 İsmail Dönmez <ismail@namtrac.org>

eseidel · eseidel · commit 0f61299d6151 · 2010-04-28T22:05:32.000Z
Reviewed by Simon Hausmann. Fix compilation with QT_NO_CURSOR defined. * platform/qt/QWebPageClient.h: (QWebPageClient::resetCursor): (QWebPageClient::setCursor): Canonical link: https://commits.webkit.org/49705@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@58436 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-04-28  İsmail Dönmez  <ismail@namtrac.org>
+
+        Reviewed by Simon Hausmann.
+
+        Fix compilation with QT_NO_CURSOR defined.
+
+        * platform/qt/QWebPageClient.h:
+        (QWebPageClient::resetCursor):
+        (QWebPageClient::setCursor):
+
 2010-04-28  Abhishek Arya  <inferno@chromium.org>
 
         Reviewed by Alexey Proskuryakov.
diff --git a/WebCore/platform/qt/QWebPageClient.h b/WebCore/platform/qt/QWebPageClient.h
@@ -61,24 +61,23 @@ class QWebPageClient {
 #if QT_VERSION >= 0x040600
     virtual void setInputMethodHint(Qt::InputMethodHint hint, bool enable) = 0;
 #endif
+
+#ifndef QT_NO_CURSOR
     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
     }
+#endif
 
     virtual QPalette palette() const = 0;
     virtual int screenNumber() const = 0;
