[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit fed5a64f5bca10525fc615f538464141b35e166b
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 27 05:33:58 2009 +0000

    2009-11-26  İsmail Dönmez  <ismail at namtrac.org>
    
            Reviewed by Eric Seidel.
    
            Compile with QT_NO_WHEELEVENT defined.
    
            * platform/qt/WheelEventQt.cpp:
            (WebCore::PlatformWheelEvent::applyDelta):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51425 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a6f1402..6175499 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-26  İsmail Dönmez  <ismail at namtrac.org>
+
+        Reviewed by Eric Seidel.
+
+        Compile with QT_NO_WHEELEVENT defined.
+
+        * platform/qt/WheelEventQt.cpp:
+        (WebCore::PlatformWheelEvent::applyDelta):
+
 2009-11-26  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebCore/platform/qt/WheelEventQt.cpp b/WebCore/platform/qt/WheelEventQt.cpp
index 9cc27ab..162a4f2 100644
--- a/WebCore/platform/qt/WheelEventQt.cpp
+++ b/WebCore/platform/qt/WheelEventQt.cpp
@@ -45,8 +45,10 @@ void PlatformWheelEvent::applyDelta(int delta, Qt::Orientation orientation)
     // Use the same single scroll step as QTextEdit
     // (in QTextEditPrivate::init [h,v]bar->setSingleStep)
     static const float cDefaultQtScrollStep = 20.f;
+#ifndef QT_NO_WHEELEVENT
     m_deltaX *= QApplication::wheelScrollLines() * cDefaultQtScrollStep;
     m_deltaY *= QApplication::wheelScrollLines() * cDefaultQtScrollStep;
+#endif
 }
 
 PlatformWheelEvent::PlatformWheelEvent(QGraphicsSceneWheelEvent* e)

-- 
WebKit Debian packaging