CMake: Regenerate projects using pro2cmake one last time

And fix up some incorrect qmake project files

Pick-to: 6.0
Change-Id: Ia6d27ac68195635021fe7c4a5f06386a60f3f323
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

4 files changed, 9 insertions, 3 deletions

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