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>

18 files changed, 66 insertions, 23 deletions

diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt
index c9bc48d151..213a834a2a 100644
--- a/tests/auto/.prev_CMakeLists.txt
+++ b/tests/auto/.prev_CMakeLists.txt
@@ -1,7 +1,6 @@
 # Generated from auto.pro.
 
 add_subdirectory(qml)
-add_subdirectory(qmldom)
 add_subdirectory(quick)
 add_subdirectory(quicktest)
 add_subdirectory(qmldevtools)
@@ -17,3 +16,6 @@ endif()
 if(TARGET Qt::Widgets)
     add_subdirectory(quickwidgets)
 endif()
+if(TARGET Qt::QmlDom)
+    add_subdirectory(qmldom)
+endif()
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index e3102d18c4..2ff1f198f0 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -1,7 +1,6 @@
 # Generated from auto.pro.
 
 add_subdirectory(qml)
-add_subdirectory(qmldom)
 add_subdirectory(quick)
 add_subdirectory(quicktest)
 add_subdirectory(qmldevtools)
@@ -19,3 +18,6 @@ endif()
 if(TARGET Qt::Widgets)
     add_subdirectory(quickwidgets)
 endif()
+if(TARGET Qt::QmlDom)
+    add_subdirectory(qmldom)
+endif()
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/qmldom/CMakeLists.txt b/tests/auto/qmldom/CMakeLists.txt
index 0aa5b19484..00fb7850f4 100644
--- a/tests/auto/qmldom/CMakeLists.txt
+++ b/tests/auto/qmldom/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Generated from qmldom.pro.
 
 add_subdirectory(errormessage)
-add_subdirectory(path)
 add_subdirectory(domitem)
+add_subdirectory(path)
 add_subdirectory(stringdumper)
diff --git a/tests/auto/qmldom/domitem/CMakeLists.txt b/tests/auto/qmldom/domitem/CMakeLists.txt
index 28bcfdefa0..71983f0cdd 100644
--- a/tests/auto/qmldom/domitem/CMakeLists.txt
+++ b/tests/auto/qmldom/domitem/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Generated from domitem.pro.
 
 #####################################################################
-## tst_qmldomitem Binary:
+## tst_qmldomitem Test:
 #####################################################################
 
 qt_internal_add_test(tst_qmldomitem
@@ -10,8 +10,6 @@ qt_internal_add_test(tst_qmldomitem
     DEFINES
         QT_DEPRECATED_WARNINGS
     PUBLIC_LIBRARIES
-        Qt::Core
         Qt::QmlDevToolsPrivate
         Qt::QmlDomPrivate
-        Qt::Test
 )
diff --git a/tests/auto/qmldom/domitem/domitem.pro b/tests/auto/qmldom/domitem/domitem.pro
index 87801c7b8d..1cbbb3b5b2 100644
--- a/tests/auto/qmldom/domitem/domitem.pro
+++ b/tests/auto/qmldom/domitem/domitem.pro
@@ -4,6 +4,7 @@ TARGET = tst_qmldomitem
 
 CONFIG += c++11 console
 CONFIG -= app_bundle
+CONFIG += testcase
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings
diff --git a/tests/auto/qmldom/errormessage/CMakeLists.txt b/tests/auto/qmldom/errormessage/CMakeLists.txt
index 7e40889b3e..4a8f5043b9 100644
--- a/tests/auto/qmldom/errormessage/CMakeLists.txt
+++ b/tests/auto/qmldom/errormessage/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Generated from errormessage.pro.
 
 #####################################################################
-## tst_qmldomerrormessage Binary:
+## tst_qmldomerrormessage Test:
 #####################################################################
 
 qt_internal_add_test(tst_qmldomerrormessage
@@ -10,8 +10,6 @@ qt_internal_add_test(tst_qmldomerrormessage
     DEFINES
         QT_DEPRECATED_WARNINGS
     PUBLIC_LIBRARIES
-        Qt::Core
         Qt::QmlDevToolsPrivate
         Qt::QmlDomPrivate
-        Qt::Test
 )
diff --git a/tests/auto/qmldom/errormessage/errormessage.pro b/tests/auto/qmldom/errormessage/errormessage.pro
index a31d904c49..21ce2bb1c9 100644
--- a/tests/auto/qmldom/errormessage/errormessage.pro
+++ b/tests/auto/qmldom/errormessage/errormessage.pro
@@ -4,6 +4,7 @@ TARGET = tst_qmldomerrormessage
 
 CONFIG += c++11 console
 CONFIG -= app_bundle
+CONFIG += testcase
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings
diff --git a/tests/auto/qmldom/path/CMakeLists.txt b/tests/auto/qmldom/path/CMakeLists.txt
index 374682b153..4c4109dd02 100644
--- a/tests/auto/qmldom/path/CMakeLists.txt
+++ b/tests/auto/qmldom/path/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Generated from path.pro.
 
 #####################################################################
-## tst_qmldompath Binary:
+## tst_qmldompath Test:
 #####################################################################
 
 qt_internal_add_test(tst_qmldompath
@@ -10,8 +10,6 @@ qt_internal_add_test(tst_qmldompath
     DEFINES
         QT_DEPRECATED_WARNINGS
     PUBLIC_LIBRARIES
-        Qt::Core
         Qt::QmlDevToolsPrivate
         Qt::QmlDomPrivate
-        Qt::Test
 )
diff --git a/tests/auto/qmldom/path/path.pro b/tests/auto/qmldom/path/path.pro
index 467948f069..744560bdc3 100644
--- a/tests/auto/qmldom/path/path.pro
+++ b/tests/auto/qmldom/path/path.pro
@@ -4,6 +4,7 @@ TARGET = tst_qmldompath
 
 CONFIG += c++11 console
 CONFIG -= app_bundle
+CONFIG += testcase
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings
diff --git a/tests/auto/qmldom/stringdumper/CMakeLists.txt b/tests/auto/qmldom/stringdumper/CMakeLists.txt
index c72467caf9..1c809c2827 100644
--- a/tests/auto/qmldom/stringdumper/CMakeLists.txt
+++ b/tests/auto/qmldom/stringdumper/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Generated from stringdumper.pro.
 
 #####################################################################
-## tst_qmldomstringdumper Binary:
+## tst_qmldomstringdumper Test:
 #####################################################################
 
 qt_internal_add_test(tst_qmldomstringdumper
@@ -9,12 +9,9 @@ qt_internal_add_test(tst_qmldomstringdumper
         tst_qmldomstringdumper.cpp
     DEFINES
         QT_DEPRECATED_WARNINGS
+    INCLUDE_DIRECTORIES
+        ../../../../src/qmldom
     PUBLIC_LIBRARIES
-        Qt::Core
         Qt::QmlDevToolsPrivate
         Qt::QmlDomPrivate
-        Qt::Test
 )
-
-## Scopes:
-#####################################################################
diff --git a/tests/auto/qmldom/stringdumper/stringdumper.pro b/tests/auto/qmldom/stringdumper/stringdumper.pro
index dc9f1a4257..2494f44023 100644
--- a/tests/auto/qmldom/stringdumper/stringdumper.pro
+++ b/tests/auto/qmldom/stringdumper/stringdumper.pro
@@ -1,4 +1,4 @@
-QT = core qmldevtools-private testlib
+QT = core qmldevtools-private qmldom-private testlib
 TARGET = tst_qmldomstringdumper
 
 
@@ -7,6 +7,7 @@ INCLUDEPATH += ../../../../src/qmldom
 
 CONFIG += c++11 console
 CONFIG -= app_bundle
+CONFIG += testcase
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings
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