summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Engels <ralf.engels@nokia.com>2010-04-21 15:07:19 +0200
committerRalf Engels <ralf.engels@nokia.com>2010-04-21 15:07:19 +0200
commit7a430d1ad9073ae1c2663be13a806460a8a5a90e (patch)
tree9f37e71ea371abeb7c327e842e2d1eb29709965a
parentaa1f7db523658311cb0c647c085562509569c708 (diff)
Build on Maemo
-rw-r--r--scroller/qkineticscroller.cpp1
-rw-r--r--scroller/qkineticscroller.h4
2 files changed, 2 insertions, 3 deletions
diff --git a/scroller/qkineticscroller.cpp b/scroller/qkineticscroller.cpp
index 63ba4fc..9b40792 100644
--- a/scroller/qkineticscroller.cpp
+++ b/scroller/qkineticscroller.cpp
@@ -222,7 +222,6 @@ void QKineticScroller::resetScrollMetrics()
metrics.insert(OvershootSpringConstant, qreal(0.1));
metrics.insert(OvershootDragResistanceFactor, qreal(1));
metrics.insert(OvershootMaximumDistance, QPointF(qreal(150), qreal(150)));
- metrics.insert(OvershootMaximumVelocity, qreal(2600));
metrics.insert(DragStartDistance, qreal(25));
metrics.insert(DragStartDirectionErrorMargin, qreal(10));
metrics.insert(MaximumVelocity, qreal(70000));
diff --git a/scroller/qkineticscroller.h b/scroller/qkineticscroller.h
index e0378d4..2a8501c 100644
--- a/scroller/qkineticscroller.h
+++ b/scroller/qkineticscroller.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QABSTRACTKINETICSCROLLER_H
-#define QABSTRACTKINETICSCROLLER_H
+#ifndef QKINETICSCROLLER_H
+#define QKINETICSCROLLER_H
#include <QtCore/qmetatype.h>
#include <QtCore/qpoint.h>