Merge pull request #13 from sfos-ja/fix-for-sfos3-change

OK

Author: topiasv

src/Flicker.qml

@@ -33,7 +33,6 @@ QtObject {
     id: flicker
     property Item target: null
     property bool enabled
-    property bool isFlicking: false
 
     onTargetChanged: {
         enabled = false

src/KeyboardBase_Flick.qml

@@ -91,7 +91,6 @@ SwipeGestureArea {
     }
 
     readonly property bool swipeGestureIsSafe: !releaseTimer.running
-    property bool isFlicking: flicker.isFlicking
 
     height: layout ? layout.height : 0
     onLayoutChanged: if (layout) layout.parent = keyboard
@@ -104,6 +103,11 @@ SwipeGestureArea {
     Flicker {
         id: flicker
         target: lastPressedKey
+        onTargetChanged: {
+            if (target && target.enableFlicker) {
+                keyboard.cancelGesture()
+            }
+        }
     }
 
     Popper {
@@ -263,7 +267,6 @@ SwipeGestureArea {
                 popper.setActiveCell(point.x, point.y)
             } else if (flicker.enabled) {
                 flicker.setIndex(point)
-                flicker.isFlicking = true
             } else {
                 updatePressedKey(point)
             }
@@ -340,7 +343,6 @@ SwipeGestureArea {
             } else {
                 if (flicker.enabled) {
                     flicker.setIndex(point)
-                    flicker.isFlicking = false
                 }
                 triggerKey(point.pressedKey)
             }