CMake: Regenerate projects using pro2cmake one last time

And fix up some incorrect qmake project files

Change-Id: Ia6d27ac68195635021fe7c4a5f06386a60f3f323
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit c1c4a874e31ba108a3600fbbb0aee7fc0bf34601)
Reviewed-by: Cristian Adam <cristian.adam@qt.io>

8 files changed, 184 insertions, 4 deletions

diff --git a/tests/auto/qml/qmlimportscanner/.prev_CMakeLists.txt b/tests/auto/qml/qmlimportscanner/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..66231beccb
--- /dev/null
+++ b/tests/auto/qml/qmlimportscanner/.prev_CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from qmlimportscanner.pro.
+
+#####################################################################
+## tst_qmlimportscanner Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_qmlimportscanner
+    SOURCES
+        ../../shared/util.cpp ../../shared/util.h
+        tst_qmlimportscanner.cpp
+    INCLUDE_DIRECTORIES
+        ../../shared
+    PUBLIC_LIBRARIES
+        Qt::Gui
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(tst_qmlimportscanner CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_internal_extend_target(tst_qmlimportscanner CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt
index 9ee509cebb..adbe3c2c9e 100644
--- a/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt
@@ -22,6 +22,7 @@ qt_internal_add_test(tst_qmltyperegistrar
 # QML_FOREIGN_METATYPES = "foreign/foreign_metatypes.json"
 # QML_IMPORT_NAME = "QmlTypeRegistrarTest"
 # QML_IMPORT_VERSION = "1.0"
+# QML_PAST_MAJOR_VERSIONS = "0"
 # TEMPLATE = "app"
 
 ## Scopes:
@@ -29,6 +30,7 @@ qt_internal_add_test(tst_qmltyperegistrar
 
 set_target_properties(tst_qmltyperegistrar PROPERTIES
     QT_QML_MODULE_VERSION 1.0
+    QT_QML_PAST_MAJOR_VERSIONS 0
     QT_QML_MODULE_URI QmlTypeRegistrarTest
     QT_QMLTYPES_FILENAME tst_qmltyperegistrar.qmltypes
 )
diff --git a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt
index db8fa4b1d6..c12ef77ebb 100644
--- a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt
+++ b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt
@@ -24,6 +24,7 @@ target_compile_definitions(tst_qmltyperegistrar PRIVATE BUILD_WITH_CMAKE) # spec
 # QML_FOREIGN_METATYPES = "foreign/foreign_metatypes.json"
 # QML_IMPORT_NAME = "QmlTypeRegistrarTest"
 # QML_IMPORT_VERSION = "1.0"
+# QML_PAST_MAJOR_VERSIONS = "0"
 # TEMPLATE = "app"
 
 ## Scopes:
@@ -31,8 +32,8 @@ target_compile_definitions(tst_qmltyperegistrar PRIVATE BUILD_WITH_CMAKE) # spec
 
 set_target_properties(tst_qmltyperegistrar PROPERTIES
     QT_QML_MODULE_VERSION 1.0
+    QT_QML_PAST_MAJOR_VERSIONS 0
     QT_QML_MODULE_URI QmlTypeRegistrarTest
-    QT_QML_PAST_MAJOR_VERSIONS 0 # special case
     QT_QMLTYPES_FILENAME tst_qmltyperegistrar.qmltypes
 )
 
diff --git a/tests/auto/quick/.prev_CMakeLists.txt b/tests/auto/quick/.prev_CMakeLists.txt
index 15cb370860..6714305201 100644
--- a/tests/auto/quick/.prev_CMakeLists.txt
+++ b/tests/auto/quick/.prev_CMakeLists.txt
@@ -62,6 +62,7 @@ if(QT_FEATURE_private_tests)
     add_subdirectory(qquicktextinput)
     add_subdirectory(qquickvisualdatamodel)
     add_subdirectory(qquickview)
+    add_subdirectory(qquickview_extra)
     add_subdirectory(qquickcanvasitem)
     add_subdirectory(qquickdesignersupport)
     add_subdirectory(qquickscreen)
diff --git a/tests/auto/quick/qquickanimations/CMakeLists.txt b/tests/auto/quick/qquickanimations/CMakeLists.txt
index 63a1236eb9..203fa770fb 100644
--- a/tests/auto/quick/qquickanimations/CMakeLists.txt
+++ b/tests/auto/quick/qquickanimations/CMakeLists.txt
@@ -29,7 +29,7 @@ qt_internal_add_test(tst_qquickanimations
 )
 
 #### Keys ignored in scope 1:.:.:qquickanimations.pro:<TRUE>:
-# OTHER_FILES = "data/animationJobSelfDestructionBug.qml" "data/attached.qml" "data/badproperty1.qml" "data/badproperty2.qml" "data/badtype1.qml" "data/badtype2.qml" "data/badtype3.qml" "data/badtype4.qml" "data/disabledTransition.qml" "data/dontAutoStart.qml" "data/dontStart.qml" "data/dontStart2.qml" "data/dotproperty.qml" "data/Double.qml" "data/doubleRegistrationBug.qml" "data/fastFlickingBug.qml" "data/looping.qml" "data/mixedtype1.qml" "data/mixedtype2.qml" "data/nonTransitionBug.qml" "data/parallelAnimationNullChildBug.qml" "data/pathAnimation.qml" "data/pathAnimation2.qml" "data/pathAnimationInOutBackCrash.qml" "data/pathAnimationNoStart.qml" "data/pathInterpolator.qml" "data/pathInterpolatorBack.qml" "data/pathInterpolatorBack2.qml" "data/pathTransition.qml" "data/pauseBindingBug.qml" "data/pauseBug.qml" "data/properties.qml" "data/properties2.qml" "data/properties3.qml" "data/properties4.qml" "data/properties5.qml" "data/propertiesTransition.qml" "data/propertiesTransition2.qml" "data/propertiesTransition3.qml" "data/propertiesTransition4.qml" "data/propertiesTransition5.qml" "data/propertiesTransition6.qml" "data/propertiesTransition7.qml" "data/reanchor.qml" "data/registrationBug.qml" "data/reparent.qml" "data/rotation.qml" "data/runningTrueBug.qml" "data/scriptActionBug.qml" "data/scriptActionCrash.qml" "data/sequentialAnimationNullChildBug.qml" "data/signals.qml" "data/signalorder.qml" "data/transitionAssignmentBug.qml" "data/valuesource.qml" "data/valuesource2.qml"
+# OTHER_FILES = "data/alwaysRunToEndInSequentialAnimationBug.qml" "data/animationJobSelfDestructionBug.qml" "data/attached.qml" "data/badproperty1.qml" "data/badproperty2.qml" "data/badtype1.qml" "data/badtype2.qml" "data/badtype3.qml" "data/badtype4.qml" "data/disabledTransition.qml" "data/dontAutoStart.qml" "data/dontStart.qml" "data/dontStart2.qml" "data/dotproperty.qml" "data/Double.qml" "data/doubleRegistrationBug.qml" "data/fastFlickingBug.qml" "data/looping.qml" "data/mixedtype1.qml" "data/mixedtype2.qml" "data/nonTransitionBug.qml" "data/parallelAnimationNullChildBug.qml" "data/pathAnimation.qml" "data/pathAnimation2.qml" "data/pathAnimationInOutBackCrash.qml" "data/pathAnimationNoStart.qml" "data/pathInterpolator.qml" "data/pathInterpolatorBack.qml" "data/pathInterpolatorBack2.qml" "data/pathTransition.qml" "data/pauseBindingBug.qml" "data/pauseBug.qml" "data/properties.qml" "data/properties2.qml" "data/properties3.qml" "data/properties4.qml" "data/properties5.qml" "data/propertiesTransition.qml" "data/propertiesTransition2.qml" "data/propertiesTransition3.qml" "data/propertiesTransition4.qml" "data/propertiesTransition5.qml" "data/propertiesTransition6.qml" "data/propertiesTransition7.qml" "data/reanchor.qml" "data/registrationBug.qml" "data/reparent.qml" "data/rotation.qml" "data/runningTrueBug.qml" "data/scriptActionBug.qml" "data/scriptActionCrash.qml" "data/sequentialAnimationNullChildBug.qml" "data/signals.qml" "data/signalorder.qml" "data/transitionAssignmentBug.qml" "data/valuesource.qml" "data/valuesource2.qml"
 
 ## Scopes:
 #####################################################################
diff --git a/tests/auto/quick/qquickdesignersupport/CMakeLists.txt b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt
index 88c050f55c..e1eb2ee997 100644
--- a/tests/auto/quick/qquickdesignersupport/CMakeLists.txt
+++ b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt
@@ -31,7 +31,7 @@ qt_internal_add_test(tst_qquickdesignersupport
 )
 
 #### Keys ignored in scope 1:.:.:qquickdesignersupport.pro:<TRUE>:
-# DISTFILES = "data/TestComponent.qml" "data/test.qml" "data/componentTest.qml" "data/Component01.qml" "data/Component02.qml"
+# DISTFILES = "data/TestComponent.qml" "data/test.qml" "data/componentTest.qml" "data/Component01.qml" "data/Component02.qml" "data/bindingTest.qml"
 
 ## Scopes:
 #####################################################################
diff --git a/tests/auto/quick/qquickview_extra/CMakeLists.txt b/tests/auto/quick/qquickview_extra/CMakeLists.txt
index 16cc36a127..4fa75da811 100644
--- a/tests/auto/quick/qquickview_extra/CMakeLists.txt
+++ b/tests/auto/quick/qquickview_extra/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Generated from qquickview.pro.
+# Generated from qquickview_extra.pro.
 
 #####################################################################
 ## tst_qquickview_extra Test:
@@ -13,9 +13,14 @@ list(APPEND test_data ${test_data_glob})
 qt_internal_add_test(tst_qquickview_extra
     SOURCES
         ../../shared/util.cpp ../../shared/util.h
+        ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h
+        ../shared/viewtestutil.cpp ../shared/viewtestutil.h
+        ../shared/visualtestutil.cpp ../shared/visualtestutil.h
         tst_qquickview_extra.cpp
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+    INCLUDE_DIRECTORIES
+        ../../shared
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui
diff --git a/tests/manual/pointer/.prev_CMakeLists.txt b/tests/manual/pointer/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..6bdb0f9e78
--- /dev/null
+++ b/tests/manual/pointer/.prev_CMakeLists.txt
@@ -0,0 +1,136 @@
+# Generated from pointer.pro.
+
+#####################################################################
+## pointer Binary:
+#####################################################################
+
+qt_internal_add_manual_test(pointer
+    GUI
+    SOURCES
+        inputinspector.cpp inputinspector.h
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Qml
+        Qt::Quick
+        Qt::QuickPrivate
+        Qt::Svg
+)
+
+# Resources:
+set(qml_resource_files
+    "content/CheckBox.qml"
+    "content/FakeFlickable.qml"
+    "content/FlashAnimation.qml"
+    "content/MomentumAnimation.qml"
+    "content/MouseAreaButton.qml"
+    "content/MouseAreaSlider.qml"
+    "content/MouseFeedbackSprite.qml"
+    "content/MptaButton.qml"
+    "content/MultiButton.qml"
+    "content/ScrollBar.qml"
+    "content/Slider.qml"
+    "content/TapHandlerButton.qml"
+    "content/TextBox.qml"
+    "content/TouchpointFeedbackSprite.qml"
+    "fakeFlickable.qml"
+    "flickableWithHandlers.qml"
+    "flingAnimation.qml"
+    "joystick.qml"
+    "main.qml"
+    "map.qml"
+    "map2.qml"
+    "mixer.qml"
+    "multibuttons.qml"
+    "photosurface.qml"
+    "pinchHandler.qml"
+    "pointerDrag.qml"
+    "resources/arrowhead.png"
+    "resources/balloon.png"
+    "resources/cursor-airbrush.png"
+    "resources/cursor-eraser.png"
+    "resources/cursor-felt-marker.png"
+    "resources/cursor-pencil.png"
+    "resources/fighter.png"
+    "resources/fingersprite.png"
+    "resources/grabbing-location.svg"
+    "resources/joystick-outer-case-pov.jpg"
+    "resources/map.svgz"
+    "resources/missile.png"
+    "resources/mixer-knob.png"
+    "resources/mouse.png"
+    "resources/mouse_left.png"
+    "resources/mouse_middle.png"
+    "resources/mouse_right.png"
+    "resources/redball.png"
+    "sidebar.qml"
+    "singlePointHandlerProperties.qml"
+    "tabletCanvasDrawing.qml"
+    "tapHandler.qml"
+)
+
+qt_internal_add_resource(pointer "qml"
+    PREFIX
+        "/"
+    FILES
+        ${qml_resource_files}
+)
+set_source_files_properties("../../../examples/quick/shared/Button.qml"
+    PROPERTIES QT_RESOURCE_ALIAS "Button.qml"
+)
+set_source_files_properties("../../../examples/quick/shared/CheckBox.qml"
+    PROPERTIES QT_RESOURCE_ALIAS "CheckBox.qml"
+)
+set_source_files_properties("../../../examples/quick/shared/Label.qml"
+    PROPERTIES QT_RESOURCE_ALIAS "Label.qml"
+)
+set_source_files_properties("../../../examples/quick/shared/LauncherList.qml"
+    PROPERTIES QT_RESOURCE_ALIAS "LauncherList.qml"
+)
+set_source_files_properties("../../../examples/quick/shared/SimpleLauncherDelegate.qml"
+    PROPERTIES QT_RESOURCE_ALIAS "SimpleLauncherDelegate.qml"
+)
+set_source_files_properties("../../../examples/quick/shared/Slider.qml"
+    PROPERTIES QT_RESOURCE_ALIAS "Slider.qml"
+)
+set_source_files_properties("../../../examples/quick/shared/TextField.qml"
+    PROPERTIES QT_RESOURCE_ALIAS "TextField.qml"
+)
+set_source_files_properties("../../../examples/quick/shared/images/back.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
+)
+set_source_files_properties("../../../examples/quick/shared/images/checkmark.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/checkmark.png"
+)
+set_source_files_properties("../../../examples/quick/shared/images/next.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/next.png"
+)
+set_source_files_properties("../../../examples/quick/shared/images/slider_handle.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_handle.png"
+)
+set(quick_shared_resource_files
+    "Button.qml"
+    "CheckBox.qml"
+    "Label.qml"
+    "LauncherList.qml"
+    "SimpleLauncherDelegate.qml"
+    "Slider.qml"
+    "TextField.qml"
+    "images/back.png"
+    "images/checkmark.png"
+    "images/next.png"
+    "images/slider_handle.png"
+)
+
+qt_internal_add_resource(pointer "quick_shared"
+    PREFIX
+        "/quick/shared"
+    BASE
+        "../../../examples/quick/shared"
+    FILES
+        ${quick_shared_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:pointer.pro:<TRUE>:
+# TEMPLATE = "app"