Regenerate Tests

Change-Id: Ib0eff9cb83b6e4c3cdbec4388969e4a194d1a88c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot

8 files changed, 11 insertions, 6 deletions

diff --git a/tests/auto/qml/qmlcachegen/CMakeLists.txt b/tests/auto/qml/qmlcachegen/CMakeLists.txt
index fcd4be8633..296e708ab4 100644
--- a/tests/auto/qml/qmlcachegen/CMakeLists.txt
+++ b/tests/auto/qml/qmlcachegen/CMakeLists.txt
@@ -80,6 +80,7 @@ set(qmake_immediate_resource_files
     "data/jsmoduleimport.qml"
     "data/library.js"
     "data/module.mjs"
+    "data/parameterAdjustment.qml"
     "data/script.js"
     "data/script.mjs"
     "data/utils.mjs"
diff --git a/tests/auto/qml/qmlmin/CMakeLists.txt b/tests/auto/qml/qmlmin/CMakeLists.txt
index b1a8037cca..3f68bd0a86 100644
--- a/tests/auto/qml/qmlmin/CMakeLists.txt
+++ b/tests/auto/qml/qmlmin/CMakeLists.txt
@@ -19,7 +19,7 @@ qt_add_test(tst_qmlmin
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qmlmin CONDITION cross_compile AND NOT boot2qt
+qt_extend_target(tst_qmlmin CONDITION CMAKE_CROSSCOMPILING AND NOT boot2qt
     DEFINES
         QTEST_CROSS_COMPILED
 )
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt
index aeb3308336..ae80ac867a 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/Imports/.prev_CMakeLists.txt
@@ -23,7 +23,7 @@ qt_add_cmake_library(Imports
 
 #### Keys ignored in scope 3:.:.:imports.pro:NOT _PRO_FILE_PWD____equals____ss_OUT_PWD:
 # COPIES = "cp"
-# cp.files = "qmldir" "plugins.qmltypes" "CompositeImports.qml"
+# cp.files = "qmldir" "plugins.qmltypes" "CompositeImports.qml" "Derived.qml"
 # cp.path = "$$OUT_PWD"
 
 qt_autogen_tools_initial_setup(Imports)
diff --git a/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt b/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt
index cf776a58ff..68d0ec977c 100644
--- a/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt
+++ b/tests/auto/qml/qmlplugindump/data/dumper/Imports/CMakeLists.txt
@@ -24,7 +24,7 @@ qt_add_cmake_library(Imports
 
 #### Keys ignored in scope 3:.:.:imports.pro:NOT _PRO_FILE_PWD____equals____ss_OUT_PWD:
 # COPIES = "cp"
-# cp.files = "qmldir" "plugins.qmltypes" "CompositeImports.qml"
+# cp.files = "qmldir" "plugins.qmltypes" "CompositeImports.qml" "Derived.qml"
 # cp.path = "$$OUT_PWD"
 
 qt_autogen_tools_initial_setup(Imports)
diff --git a/tests/auto/qml/qqmlparser/CMakeLists.txt b/tests/auto/qml/qqmlparser/CMakeLists.txt
index 074e979d86..909e3ff3e2 100644
--- a/tests/auto/qml/qqmlparser/CMakeLists.txt
+++ b/tests/auto/qml/qqmlparser/CMakeLists.txt
@@ -29,7 +29,7 @@ qt_add_test(tst_qqmlparser
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qqmlparser CONDITION cross_compile
+qt_extend_target(tst_qqmlparser CONDITION CMAKE_CROSSCOMPILING
     DEFINES
         QTEST_CROSS_COMPILED
 )
diff --git a/tests/auto/qml/qqmltablemodel/CMakeLists.txt b/tests/auto/qml/qqmltablemodel/CMakeLists.txt
index 519f3334ad..7c25f12c94 100644
--- a/tests/auto/qml/qqmltablemodel/CMakeLists.txt
+++ b/tests/auto/qml/qqmltablemodel/CMakeLists.txt
@@ -17,13 +17,11 @@ qt_add_test(tst_qqmltablemodel
     INCLUDE_DIRECTORIES
         ../../shared
     LIBRARIES
-        Qt::QmlModelsPrivate
         Qt::QmlPrivate
         Qt::QuickPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::Qml
-        Qt::QmlModels
         Qt::Quick
     TESTDATA ${test_data}
 )
diff --git a/tests/auto/qml/qqmltypeloader/CMakeLists.txt b/tests/auto/qml/qqmltypeloader/CMakeLists.txt
index 8e71ea4315..4274c8cadf 100644
--- a/tests/auto/qml/qqmltypeloader/CMakeLists.txt
+++ b/tests/auto/qml/qqmltypeloader/CMakeLists.txt
@@ -14,6 +14,7 @@ qt_add_test(tst_qqmltypeloader
     SOURCES
         ../../shared/testhttpserver.cpp ../../shared/testhttpserver.h
         ../../shared/util.cpp ../../shared/util.h
+        declarativetesttype.h
         tst_qqmltypeloader.cpp
     INCLUDE_DIRECTORIES
         ../../shared
@@ -26,6 +27,10 @@ qt_add_test(tst_qqmltypeloader
     TESTDATA ${test_data}
 )
 
+#### Keys ignored in scope 1:.:.:tst_qqmltypeloader.pro:<TRUE>:
+# QML_IMPORT_NAME = "declarative.import.for.typeloader.test"
+# QML_IMPORT_VERSION = "3.2"
+
 ## Scopes:
 #####################################################################
 
diff --git a/tests/auto/quicktest/testfiltering/test/CMakeLists.txt b/tests/auto/quicktest/testfiltering/test/CMakeLists.txt
index cfdb53ca89..f00249bfc4 100644
--- a/tests/auto/quicktest/testfiltering/test/CMakeLists.txt
+++ b/tests/auto/quicktest/testfiltering/test/CMakeLists.txt
@@ -5,6 +5,7 @@
 #####################################################################
 
 qt_add_test(tst_testfiltering
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
     SOURCES
         ../tst_testfiltering.cpp
     PUBLIC_LIBRARIES