summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-06 15:30:18 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-06 15:30:18 +1000
commit8c6f2fdf09eb2998cb013659ca7a2154792ffa98 (patch)
treec13bb27adf01e18cd3a8313343af9b2321b2dd61 /mkspecs
parentdc7385b41bf81e6c12dbd3c33c2bea577e067970 (diff)
parent160f1867868cdea916923652b00484ed11f90aaa (diff)
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Improve Flickable dynamics and allow platform specific tweaking.
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/linux-g++-maemo/qplatformdefs.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/mkspecs/linux-g++-maemo/qplatformdefs.h b/mkspecs/linux-g++-maemo/qplatformdefs.h
index cf6d24e13d..0a0e122f99 100644
--- a/mkspecs/linux-g++-maemo/qplatformdefs.h
+++ b/mkspecs/linux-g++-maemo/qplatformdefs.h
@@ -43,3 +43,11 @@
#define QT_GUI_DOUBLE_CLICK_RADIUS 20
#define QT_GUI_DRAG_DISTANCE 16
+
+#define QML_FLICK_OVERSHOOT 160
+#define QML_FLICK_SAMPLEBUFFER 6
+#define QML_FLICK_DISCARDSAMPLES 2
+#define QML_FLICK_DEFAULTMAXVELOCITY 2500
+#define QML_FLICK_DEFAULTDECELERATION 2000
+#define QML_FLICK_OVERSHOOTFRICTION 10
+