diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-07 13:13:08 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-07 13:14:27 (GMT) |
| commit | 7c8980ee041e874a6c430f01b2daff4955517b03 (patch) | |
| tree | aa19249a7fb469176fb22adfa9a1b702ae3be6c0 /mkspecs/linux-g++-maemo | |
| parent | 8031eada2f81963865390b4d899631b09d4ca6f3 (diff) | |
| parent | a05f73499a187c67a394893e2cc74516ccbc46f5 (diff) | |
| download | Qt-7c8980ee041e874a6c430f01b2daff4955517b03.zip Qt-7c8980ee041e874a6c430f01b2daff4955517b03.tar.gz Qt-7c8980ee041e874a6c430f01b2daff4955517b03.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/gui/text/qfontengine_mac.mm
tests/auto/qdiriterator/tst_qdiriterator.cpp
Diffstat (limited to 'mkspecs/linux-g++-maemo')
| -rw-r--r-- | mkspecs/linux-g++-maemo/qplatformdefs.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mkspecs/linux-g++-maemo/qplatformdefs.h b/mkspecs/linux-g++-maemo/qplatformdefs.h index cf6d24e..0a0e122 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 + |