diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-20 22:23:14 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-10 19:56:35 +0000 |
commit | 37da30b83021869b2fd069ea49d72d89b16c2046 (patch) | |
tree | 104a5c565b140a7cdd5492264f3d5edc3f94461c /src/quick/items/qquickitemsmodule.cpp | |
parent | 70a5d7bd8755c84425f473585bb05376360e6b4e (diff) |
Allow custom bounds behaviors for Flickable
[ChangeLog][QtQuick][Flickable] Added a boundsMovement property that
allows disabling the default bounce effect and implementing custom
edge effects.
Task-number: QTBUG-38515
Change-Id: Id00d30a863e264cdbac00fbad8189406f29484c4
Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items/qquickitemsmodule.cpp')
-rw-r--r-- | src/quick/items/qquickitemsmodule.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp index 4d6ae0c3e2..13f23c918a 100644 --- a/src/quick/items/qquickitemsmodule.cpp +++ b/src/quick/items/qquickitemsmodule.cpp @@ -389,6 +389,8 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) #if QT_CONFIG(quick_shadereffect) qmlRegisterType<QQuickShaderEffectSource, 2>(uri, 2, 9, "ShaderEffectSource"); #endif + + qmlRegisterType<QQuickFlickable, 10>(uri, 2, 10, "Flickable"); } static void initResources() |