Import Qt6 conversion patchHEADtrout_19.90.0trout/19.90.019.90.0master

Import the patches for the demo applications into the app repos.

Bug-AGL: SPEC-5294
Change-Id: Icc5765db59ab6a8271d2169a259df1d106fd36b7
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

1 files changed, 6 insertions, 13 deletions

diff --git a/app/navigation.qml b/app/navigation.qml
index 5cb3634..0d61d46 100644
--- a/app/navigation.qml
+++ b/app/navigation.qml
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-import QtQuick 2.6
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 2.0
-import QtLocation 5.9
-import QtPositioning 5.6
-import QtQuick.Window 2.11
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtLocation
+import QtPositioning
+import QtQuick.Window
 
 ApplicationWindow {
     id: root
@@ -476,13 +476,6 @@ ApplicationWindow {
             }
         }
 
-        gesture.onFlickStarted: {
-            btn_present_position.state = "Optional"
-        }
-        gesture.onPanStarted: {
-            btn_present_position.state = "Optional"
-        }
-
         function updatePositon() {
             if (!routeModel.get(0))
                 return;