summaryrefslogtreecommitdiffstats
path: root/src/gui/util
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@nokia.com>2010-12-15 17:24:27 (GMT)
committerRobert Griebl <robert.griebl@nokia.com>2010-12-15 17:51:01 (GMT)
commitdf30d58de183d13c649ef7e0fbb8e2b3658e0862 (patch)
tree24255cb47e664714bb10736e12fe5ecaf335e435 /src/gui/util
parentfe438d7d828021d7f86301af36fe8dff2768532a (diff)
downloadQt-df30d58de183d13c649ef7e0fbb8e2b3658e0862.zip
Qt-df30d58de183d13c649ef7e0fbb8e2b3658e0862.tar.gz
Qt-df30d58de183d13c649ef7e0fbb8e2b3658e0862.tar.bz2
Removed obsolete Maemo 5 code
Diffstat (limited to 'src/gui/util')
-rw-r--r--src/gui/util/qscrollerproperties.cpp24
1 files changed, 1 insertions, 23 deletions
diff --git a/src/gui/util/qscrollerproperties.cpp b/src/gui/util/qscrollerproperties.cpp
index 4a1f085..2e52959 100644
--- a/src/gui/util/qscrollerproperties.cpp
+++ b/src/gui/util/qscrollerproperties.cpp
@@ -58,28 +58,6 @@ QScrollerPropertiesPrivate *QScrollerPropertiesPrivate::defaults()
{
if (!systemDefaults) {
QScrollerPropertiesPrivate spp;
-#ifdef Q_WS_MAEMO_5
- spp.mousePressEventDelay = qreal(0);
- spp.dragStartDistance = qreal(2.5 / 1000);
- spp.dragVelocitySmoothingFactor = qreal(10);
- spp.axisLockThreshold = qreal(0);
- spp.scrollingCurve.setType(QEasingCurve::OutQuad);
- spp.decelerationFactor = 1.0;
- spp.minimumVelocity = qreal(0.0195);
- spp.maximumVelocity = qreal(6.84);
- spp.maximumClickThroughVelocity = qreal(0.0684);
- spp.acceleratingFlickMaximumTime = qreal(0.125);
- spp.acceleratingFlickSpeedupFactor = qreal(3.0);
- spp.snapPositionRatio = qreal(0.25);
- spp.snapTime = qreal(1);
- spp.overshootDragResistanceFactor = qreal(1);
- spp.overshootDragDistanceFactor = qreal(0.3);
- spp.overshootScrollDistanceFactor = qreal(0.3);
- spp.overshootScrollTime = qreal(0.5);
- spp.hOvershootPolicy = QScrollerProperties::OvershootWhenScrollable;
- spp.vOvershootPolicy = QScrollerProperties::OvershootWhenScrollable;
- spp.frameRate = QScrollerProperties::Fps30;
-#else
spp.mousePressEventDelay = qreal(0.25);
spp.dragStartDistance = qreal(5.0 / 1000);
spp.dragVelocitySmoothingFactor = qreal(0.8);
@@ -104,7 +82,7 @@ QScrollerPropertiesPrivate *QScrollerPropertiesPrivate::defaults()
spp.hOvershootPolicy = QScrollerProperties::OvershootWhenScrollable;
spp.vOvershootPolicy = QScrollerProperties::OvershootWhenScrollable;
spp.frameRate = QScrollerProperties::Standard;
-#endif
+
systemDefaults = new QScrollerPropertiesPrivate(spp);
}
return new QScrollerPropertiesPrivate(userDefaults ? *userDefaults : *systemDefaults);