diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:44:33 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:44:33 +0100 |
| commit | 9a67c418ebcd23b7a29dda123cccfd77f7d973fa (patch) | |
| tree | 3aca6dc846ce966dd39362d4d94c70031afb5f55 /examples | |
| parent | 691d62dcd6c028e509ebb5241bb0a184faf3a5fc (diff) | |
| parent | d367ac81d5ef77f02434274524477dc0e5c2b4a4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: If24938cb15392873cfd45c49901c6f1cc3e9f128
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphoneapp.qml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphoneapp.qml b/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphoneapp.qml index 5ca3946..9ab674d 100644 --- a/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphoneapp.qml +++ b/examples/canvas3d/canvas3d/threejs/cellphone/qml/cellphone/cellphoneapp.qml @@ -314,14 +314,12 @@ Rectangle { flickDeceleration: 0 onMovementStarted: { // Interpret all drags as flicks instead - if (interactive) + if (interactive) { + interactive = false flick(-flickSpeed, 0) - interactive = false + } } onFlickStarted: { - // All flicks will open the screen at consistent speed - if (interactive) - flick(-flickSpeed, 0) interactive = false } onFlickEnded: { |