Pointer manual test: double up flickablesWithHandlers.qml

It was one Flickable before, with stuff in it; now it's two of the same,
side-by-side, so as to test flicking the two in parallel on a touchscreen.

Change-Id: Iec1ef935ee1c0a97bed49959b117b85d65fa84af
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

4 files changed, 25 insertions, 13 deletions

diff --git a/tests/manual/pointer/CMakeLists.txt b/tests/manual/pointer/CMakeLists.txt
index 04e99ce4e6..aa3af125dc 100644
--- a/tests/manual/pointer/CMakeLists.txt
+++ b/tests/manual/pointer/CMakeLists.txt
@@ -34,7 +34,7 @@ set(qml_resource_files
     "content/TextBox.qml"
     "content/TouchpointFeedbackSprite.qml"
     "fakeFlickable.qml"
-    "flickableWithHandlers.qml"
+    "flickablesWithHandlers.qml"
     "flingAnimation.qml"
     "joystick.qml"
     "main.qml"
diff --git a/tests/manual/pointer/flickableWithHandlers.qml b/tests/manual/pointer/flickablesWithHandlers.qml
index 08cedb9a16..3a854b2d14 100644
--- a/tests/manual/pointer/flickableWithHandlers.qml
+++ b/tests/manual/pointer/flickablesWithHandlers.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the manual tests of the Qt Toolkit.
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
+import QtQuick
 import "qrc:/quick/shared/" as Examples
 import "content"
 
@@ -35,18 +35,24 @@ Rectangle {
     width: 400
     height: 400
     objectName: "root"
-    color: "#222222"
+    color: "steelblue"
 
-    Flickable {
-        anchors.fill: parent
-        anchors.margins: 10
-        anchors.topMargin: 40
-        contentHeight: 600
-        contentWidth: 600
+    component FlickableStuff: Flickable {
+        width: root.width / 2 - 2
+        height: 400
+        contentWidth: width
+        contentHeight: 800
         pressDelay: pressDelayCB.checked ? 1000 : 0
 
+        Rectangle {
+            anchors.fill: parent
+            color: "#222222"
+        }
+
         Column {
             spacing: 6
+            anchors.fill: parent
+            anchors.margins: 6
             Rectangle {
                 radius: 5
                 width: parent.width - 12
@@ -60,7 +66,6 @@ Rectangle {
                 }
             }
 
-
             Row {
                 spacing: 6
                 Slider {
@@ -92,4 +97,11 @@ Rectangle {
             }
         }
     }
+
+    Row {
+        anchors.fill: parent
+        spacing: 2
+        FlickableStuff { }
+        FlickableStuff { }
+    }
 }
diff --git a/tests/manual/pointer/main.qml b/tests/manual/pointer/main.qml
index 83e1d3b2ba..c7c1380c64 100644
--- a/tests/manual/pointer/main.qml
+++ b/tests/manual/pointer/main.qml
@@ -55,7 +55,7 @@ Window {
             addExample("photo surface", "re-implementation of the existing photo surface demo using Handlers", Qt.resolvedUrl("photosurface.qml"))
             addExample("tap", "TapHandler: device-agnostic tap/click detection for buttons", Qt.resolvedUrl("tapHandler.qml"))
             addExample("multibuttons", "TapHandler: gesturePolicy (99 red balloons)", Qt.resolvedUrl("multibuttons.qml"))
-            addExample("flickable with Handlers", "Flickable with buttons, sliders etc. implemented in various ways", Qt.resolvedUrl("flickableWithHandlers.qml"))
+            addExample("flickables with Handlers", "Parallel Flickables with buttons, sliders etc. implemented in various ways", Qt.resolvedUrl("flickablesWithHandlers.qml"))
             addExample("tap and drag", "Flickable with all possible combinations of TapHandler and DragHandler children", Qt.resolvedUrl("pointerDrag.qml"))
             addExample("tablet canvas", "PointHandler and HoverHandler with a tablet: detect the stylus, and draw", Qt.resolvedUrl("tabletCanvasDrawing.qml"))
         }
diff --git a/tests/manual/pointer/qml.qrc b/tests/manual/pointer/qml.qrc
index 20956fcbac..79df367391 100644
--- a/tests/manual/pointer/qml.qrc
+++ b/tests/manual/pointer/qml.qrc
@@ -3,7 +3,7 @@
         <file>flingAnimation.qml</file>
         <file>main.qml</file>
         <file>fakeFlickable.qml</file>
-        <file>flickableWithHandlers.qml</file>
+        <file>flickablesWithHandlers.qml</file>
         <file>joystick.qml</file>
         <file>map.qml</file>
         <file>mixer.qml</file>