CMake: Regenerate projectswip/cmake

Change-Id: Ifd6b2289de6465a010f5f2a32789221767b4d5be
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

24 files changed, 223 insertions, 169 deletions

diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index af891b6f..8976a7dd 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -14,6 +14,7 @@ add_subdirectory(pressandhold)
 add_subdirectory(qquickapplicationwindow)
 add_subdirectory(qquickcolor)
 add_subdirectory(qquickdrawer)
+add_subdirectory(qquickheaderview)
 add_subdirectory(qquickiconimage)
 add_subdirectory(qquickiconlabel)
 add_subdirectory(qquickimaginestyle)
@@ -30,3 +31,4 @@ add_subdirectory(qquickuniversalstyleconf)
 add_subdirectory(revisions)
 add_subdirectory(sanity)
 add_subdirectory(snippets)
+add_subdirectory(translation)
diff --git a/tests/auto/accessibility/CMakeLists.txt b/tests/auto/accessibility/CMakeLists.txt
index 5d239ddc..a1f67d17 100644
--- a/tests/auto/accessibility/CMakeLists.txt
+++ b/tests/auto/accessibility/CMakeLists.txt
@@ -18,19 +18,15 @@ qt_add_test(tst_accessibility
         tst_accessibility.cpp
     DEFINES
         QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlPrivate
+        Qt::QuickControls2
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
         Qt::TestPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickTemplates2
     TESTDATA ${test_data}
 )
 
@@ -40,12 +36,12 @@ qt_add_test(tst_accessibility
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_accessibility CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_accessibility CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_accessibility CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_accessibility CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/cursor/CMakeLists.txt b/tests/auto/cursor/CMakeLists.txt
index 9d58b48e..8034a11a 100644
--- a/tests/auto/cursor/CMakeLists.txt
+++ b/tests/auto/cursor/CMakeLists.txt
@@ -18,19 +18,15 @@ qt_add_test(tst_cursor
         tst_cursor.cpp
     DEFINES
         QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlPrivate
+        Qt::QuickControls2
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
         Qt::TestPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickTemplates2
     TESTDATA ${test_data}
 )
 
@@ -40,12 +36,12 @@ qt_add_test(tst_cursor
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_cursor CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_cursor CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_cursor CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_cursor CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/customization/CMakeLists.txt b/tests/auto/customization/CMakeLists.txt
index 2e25d8a4..40e916a8 100644
--- a/tests/auto/customization/CMakeLists.txt
+++ b/tests/auto/customization/CMakeLists.txt
@@ -18,31 +18,27 @@ qt_add_test(tst_customization
         tst_customization.cpp
     DEFINES
         QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlPrivate
+        Qt::QuickControls2
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
         Qt::TestPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickTemplates2
     TESTDATA ${test_data}
 )
 
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_customization CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_customization CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_customization CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_customization CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/designer/CMakeLists.txt b/tests/auto/designer/CMakeLists.txt
index 5731e570..59e7c5a0 100644
--- a/tests/auto/designer/CMakeLists.txt
+++ b/tests/auto/designer/CMakeLists.txt
@@ -7,12 +7,11 @@
 qt_add_test(tst_designer
     SOURCES
         tst_designer.cpp
-    LIBRARIES
-        Qt::QuickPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::Quick
         Qt::QuickControls2
+        Qt::QuickPrivate
 )
 
 #### Keys ignored in scope 1:.:.:designer.pro:<TRUE>:
diff --git a/tests/auto/focus/CMakeLists.txt b/tests/auto/focus/CMakeLists.txt
index be2a3016..1cc44de4 100644
--- a/tests/auto/focus/CMakeLists.txt
+++ b/tests/auto/focus/CMakeLists.txt
@@ -18,31 +18,27 @@ qt_add_test(tst_focus
         tst_focus.cpp
     DEFINES
         QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlPrivate
+        Qt::QuickControls2
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
         Qt::TestPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickTemplates2
     TESTDATA ${test_data}
 )
 
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_focus CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_focus CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_focus CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_focus CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/font/CMakeLists.txt b/tests/auto/font/CMakeLists.txt
index daeb391f..8529adb8 100644
--- a/tests/auto/font/CMakeLists.txt
+++ b/tests/auto/font/CMakeLists.txt
@@ -18,20 +18,16 @@ qt_add_test(tst_font
         tst_font.cpp
     DEFINES
         QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlPrivate
+        Qt::QuickControls2
         Qt::QuickControls2Private
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
         Qt::TestPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickTemplates2
     TESTDATA ${test_data}
 )
 
@@ -41,12 +37,12 @@ qt_add_test(tst_font
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_font CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_font CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_font CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_font CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/palette/CMakeLists.txt b/tests/auto/palette/CMakeLists.txt
index 6675af36..33f8b86b 100644
--- a/tests/auto/palette/CMakeLists.txt
+++ b/tests/auto/palette/CMakeLists.txt
@@ -18,20 +18,16 @@ qt_add_test(tst_palette
         tst_palette.cpp
     DEFINES
         QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlPrivate
+        Qt::QuickControls2
         Qt::QuickControls2Private
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
         Qt::TestPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickTemplates2
     TESTDATA ${test_data}
 )
 
@@ -54,12 +50,12 @@ qt_add_resource(tst_palette "qmake_immediate"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_palette CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_palette CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_palette CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_palette CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickapplicationwindow/CMakeLists.txt b/tests/auto/qquickapplicationwindow/CMakeLists.txt
index 26aa0331..6fa2e692 100644
--- a/tests/auto/qquickapplicationwindow/CMakeLists.txt
+++ b/tests/auto/qquickapplicationwindow/CMakeLists.txt
@@ -18,20 +18,16 @@ qt_add_test(tst_qquickapplicationwindow
         tst_qquickapplicationwindow.cpp
     DEFINES
         QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlPrivate
+        Qt::QuickControls2
         Qt::QuickControls2Private
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
         Qt::TestPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickTemplates2
     TESTDATA ${test_data}
 )
 
@@ -41,12 +37,12 @@ qt_add_test(tst_qquickapplicationwindow
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickapplicationwindow CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickapplicationwindow CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickapplicationwindow CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickapplicationwindow CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickdrawer/CMakeLists.txt b/tests/auto/qquickdrawer/CMakeLists.txt
index db35045a..3679471a 100644
--- a/tests/auto/qquickdrawer/CMakeLists.txt
+++ b/tests/auto/qquickdrawer/CMakeLists.txt
@@ -18,19 +18,15 @@ qt_add_test(tst_qquickdrawer
         tst_qquickdrawer.cpp
     DEFINES
         QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlPrivate
+        Qt::QuickControls2
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
         Qt::TestPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickTemplates2
     TESTDATA ${test_data}
 )
 
@@ -40,12 +36,12 @@ qt_add_test(tst_qquickdrawer
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickdrawer CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickdrawer CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickdrawer CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickdrawer CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickheaderview/CMakeLists.txt b/tests/auto/qquickheaderview/CMakeLists.txt
new file mode 100644
index 00000000..fe604d5c
--- /dev/null
+++ b/tests/auto/qquickheaderview/CMakeLists.txt
@@ -0,0 +1,49 @@
+# Generated from qquickheaderview.pro.
+
+#####################################################################
+## tst_qquickheaderview Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_add_test(tst_qquickheaderview
+    SOURCES
+        ../shared/qtest_quickcontrols.h
+        ../shared/util.cpp ../shared/util.h
+        ../shared/visualtestutil.cpp ../shared/visualtestutil.h
+        tst_qquickheaderview.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickControls2Private
+        Qt::QuickPrivate
+        Qt::QuickTemplates2
+        Qt::QuickTemplates2Private
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:qquickheaderview.pro:<TRUE>:
+# OTHER_FILES = "data/*.qml"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(tst_qquickheaderview CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_extend_target(tst_qquickheaderview CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)
diff --git a/tests/auto/qquickiconimage/CMakeLists.txt b/tests/auto/qquickiconimage/CMakeLists.txt
index c2628782..9f6d0494 100644
--- a/tests/auto/qquickiconimage/CMakeLists.txt
+++ b/tests/auto/qquickiconimage/CMakeLists.txt
@@ -23,19 +23,19 @@ qt_add_test(tst_qquickiconimage
     DEFINES
         QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
     LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::QmlPrivate
         Qt::QuickControls2Private
         Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::TestPrivate
     PUBLIC_LIBRARIES
+        Qt::CorePrivate
         Qt::Gui
+        Qt::GuiPrivate
         Qt::Qml
+        Qt::QmlPrivate
         Qt::Quick
         Qt::QuickControls2
-        Qt::QuickTemplates2
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::TestPrivate
     TESTDATA ${test_data}
 )
 
@@ -72,12 +72,12 @@ qt_extend_target(tst_qquickiconimage CONDITION TARGET Qt::Svg
         Qt::Svg
 )
 
-qt_extend_target(tst_qquickiconimage CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickiconimage CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickiconimage CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickiconimage CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickiconlabel/CMakeLists.txt b/tests/auto/qquickiconlabel/CMakeLists.txt
index fc3de622..bdbefd9d 100644
--- a/tests/auto/qquickiconlabel/CMakeLists.txt
+++ b/tests/auto/qquickiconlabel/CMakeLists.txt
@@ -19,31 +19,31 @@ qt_add_test(tst_qquickiconlabel
     DEFINES
         QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
     LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-        Qt::QmlPrivate
         Qt::QuickControls2Private
         Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::TestPrivate
     PUBLIC_LIBRARIES
+        Qt::CorePrivate
         Qt::Gui
+        Qt::GuiPrivate
         Qt::Qml
+        Qt::QmlPrivate
         Qt::Quick
         Qt::QuickControls2
-        Qt::QuickTemplates2
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::TestPrivate
     TESTDATA ${test_data}
 )
 
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickiconlabel CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickiconlabel CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickiconlabel CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickiconlabel CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickimaginestyle/CMakeLists.txt b/tests/auto/qquickimaginestyle/CMakeLists.txt
index 5ab0176c..7a3ffe08 100644
--- a/tests/auto/qquickimaginestyle/CMakeLists.txt
+++ b/tests/auto/qquickimaginestyle/CMakeLists.txt
@@ -24,6 +24,8 @@ qt_add_test(tst_qquickimaginestyle
 set(qmake_immediate_resource_files
     "control-assets/button-background.9.png"
     "qtquickcontrols2.conf"
+    "test-assets/button-background-1.png"
+    "test-assets/button-background-2.png"
 )
 
 qt_add_resource(tst_qquickimaginestyle "qmake_immediate"
diff --git a/tests/auto/qquickmaterialstyleconf/CMakeLists.txt b/tests/auto/qquickmaterialstyleconf/CMakeLists.txt
index 054b0cc3..fa0dde32 100644
--- a/tests/auto/qquickmaterialstyleconf/CMakeLists.txt
+++ b/tests/auto/qquickmaterialstyleconf/CMakeLists.txt
@@ -18,20 +18,16 @@ qt_add_test(tst_qquickmaterialstyleconf
         tst_qquickmaterialstyleconf.cpp
     DEFINES
         QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlPrivate
+        Qt::QuickControls2
         Qt::QuickControls2Private
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
         Qt::TestPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickTemplates2
     TESTDATA ${test_data}
 )
 
@@ -56,12 +52,12 @@ qt_add_resource(tst_qquickmaterialstyleconf "qquickmaterialstyleconf"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickmaterialstyleconf CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickmaterialstyleconf CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickmaterialstyleconf CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickmaterialstyleconf CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickmenu/CMakeLists.txt b/tests/auto/qquickmenu/CMakeLists.txt
index 4152869c..478aaa82 100644
--- a/tests/auto/qquickmenu/CMakeLists.txt
+++ b/tests/auto/qquickmenu/CMakeLists.txt
@@ -18,19 +18,15 @@ qt_add_test(tst_qquickmenu
         tst_qquickmenu.cpp
     DEFINES
         QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlPrivate
+        Qt::QuickControls2
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
         Qt::TestPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickTemplates2
     TESTDATA ${test_data}
 )
 
@@ -40,12 +36,12 @@ qt_add_test(tst_qquickmenu
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickmenu CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickmenu CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickmenu CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickmenu CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickmenubar/CMakeLists.txt b/tests/auto/qquickmenubar/CMakeLists.txt
index c066ef01..0803b4ec 100644
--- a/tests/auto/qquickmenubar/CMakeLists.txt
+++ b/tests/auto/qquickmenubar/CMakeLists.txt
@@ -18,19 +18,15 @@ qt_add_test(tst_qquickmenubar
         tst_qquickmenubar.cpp
     DEFINES
         QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlPrivate
+        Qt::QuickControls2
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
         Qt::TestPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickTemplates2
     TESTDATA ${test_data}
 )
 
@@ -40,12 +36,12 @@ qt_add_test(tst_qquickmenubar
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickmenubar CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickmenubar CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickmenubar CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickmenubar CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickninepatchimage/CMakeLists.txt b/tests/auto/qquickninepatchimage/CMakeLists.txt
index dc8e0a5b..23c2adb2 100644
--- a/tests/auto/qquickninepatchimage/CMakeLists.txt
+++ b/tests/auto/qquickninepatchimage/CMakeLists.txt
@@ -23,31 +23,32 @@ qt_add_test(tst_qquickninepatchimage
     DEFINES
         QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
     LIBRARIES
-        Qt::CorePrivate
         Qt::GuiPrivate
-        Qt::QmlPrivate
         Qt::QuickControls2Private
         Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::TestPrivate
     PUBLIC_LIBRARIES
+        Qt::CorePrivate
         Qt::Gui
+        Qt::GuiPrivate
         Qt::Qml
+        Qt::QmlPrivate
         Qt::Quick
         Qt::QuickControls2
-        Qt::QuickTemplates2
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::TestPrivate
     TESTDATA ${test_data}
 )
 
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickninepatchimage CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickninepatchimage CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickninepatchimage CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickninepatchimage CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickpopup/CMakeLists.txt b/tests/auto/qquickpopup/CMakeLists.txt
index 7df9ac8a..beb744a7 100644
--- a/tests/auto/qquickpopup/CMakeLists.txt
+++ b/tests/auto/qquickpopup/CMakeLists.txt
@@ -18,19 +18,15 @@ qt_add_test(tst_qquickpopup
         tst_qquickpopup.cpp
     DEFINES
         QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlPrivate
+        Qt::QuickControls2
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
         Qt::TestPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickTemplates2
     TESTDATA ${test_data}
 )
 
@@ -40,12 +36,12 @@ qt_add_test(tst_qquickpopup
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickpopup CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickpopup CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickpopup CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickpopup CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickstyle/CMakeLists.txt b/tests/auto/qquickstyle/CMakeLists.txt
index ea824969..94aa7249 100644
--- a/tests/auto/qquickstyle/CMakeLists.txt
+++ b/tests/auto/qquickstyle/CMakeLists.txt
@@ -21,17 +21,16 @@ qt_add_test(tst_qquickstyle
     LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-        Qt::QmlPrivate
         Qt::QuickControls2Private
-        Qt::QuickPrivate
-        Qt::QuickTemplates2Private
-        Qt::TestPrivate
     PUBLIC_LIBRARIES
+        Qt::CorePrivate
         Qt::Gui
-        Qt::Qml
-        Qt::Quick
+        Qt::GuiPrivate
+        Qt::QmlPrivate
         Qt::QuickControls2
-        Qt::QuickTemplates2
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::TestPrivate
     TESTDATA ${test_data}
 )
 
@@ -101,12 +100,12 @@ qt_add_resource(tst_qquickstyle "qmake_qrcStyles4"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickstyle CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickstyle CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickstyle CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickstyle CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickstyleselector/CMakeLists.txt b/tests/auto/qquickstyleselector/CMakeLists.txt
index b9d8d671..3a489ccf 100644
--- a/tests/auto/qquickstyleselector/CMakeLists.txt
+++ b/tests/auto/qquickstyleselector/CMakeLists.txt
@@ -18,20 +18,16 @@ qt_add_test(tst_qquickstyleselector
         tst_qquickstyleselector.cpp
     DEFINES
         QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlPrivate
+        Qt::QuickControls2
         Qt::QuickControls2Private
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
         Qt::TestPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickTemplates2
     TESTDATA ${test_data}
 )
 
@@ -54,12 +50,12 @@ qt_add_resource(tst_qquickstyleselector "qmake_resourcestyle"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickstyleselector CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickstyleselector CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickstyleselector CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickstyleselector CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/qquickuniversalstyleconf/CMakeLists.txt b/tests/auto/qquickuniversalstyleconf/CMakeLists.txt
index 361e690f..1125e75b 100644
--- a/tests/auto/qquickuniversalstyleconf/CMakeLists.txt
+++ b/tests/auto/qquickuniversalstyleconf/CMakeLists.txt
@@ -18,20 +18,16 @@ qt_add_test(tst_qquickuniversalstyleconf
         tst_qquickuniversalstyleconf.cpp
     DEFINES
         QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
         Qt::QmlPrivate
+        Qt::QuickControls2
         Qt::QuickControls2Private
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
         Qt::TestPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickTemplates2
     TESTDATA ${test_data}
 )
 
@@ -54,12 +50,12 @@ qt_add_resource(tst_qquickuniversalstyleconf "qquickuniversalstyleconf"
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_qquickuniversalstyleconf CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_qquickuniversalstyleconf CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_qquickuniversalstyleconf CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_qquickuniversalstyleconf CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/sanity/CMakeLists.txt b/tests/auto/sanity/CMakeLists.txt
index f4f6fcdc..f7539771 100644
--- a/tests/auto/sanity/CMakeLists.txt
+++ b/tests/auto/sanity/CMakeLists.txt
@@ -12,19 +12,16 @@ qt_add_test(tst_sanity
         tst_sanity.cpp
     DEFINES
         QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::Gui
         Qt::GuiPrivate
+        Qt::Qml
         Qt::QmlPrivate
+        Qt::QuickControls2
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
         Qt::TestPrivate
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickTemplates2
 )
 
 #### Keys ignored in scope 1:.:.:sanity.pro:<TRUE>:
@@ -34,12 +31,12 @@ qt_add_test(tst_sanity
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_sanity CONDITION ANDROID OR APPLE_IOS
+qt_extend_target(tst_sanity CONDITION ANDROID OR IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
 )
 
-qt_extend_target(tst_sanity CONDITION NOT ANDROID AND NOT APPLE_IOS
+qt_extend_target(tst_sanity CONDITION NOT ANDROID AND NOT IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
 )
diff --git a/tests/auto/translation/CMakeLists.txt b/tests/auto/translation/CMakeLists.txt
new file mode 100644
index 00000000..50e10171
--- /dev/null
+++ b/tests/auto/translation/CMakeLists.txt
@@ -0,0 +1,61 @@
+# Generated from translation.pro.
+
+#####################################################################
+## tst_translation Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_add_test(tst_translation
+    SOURCES
+        ../shared/qtest_quickcontrols.h
+        ../shared/util.cpp ../shared/util.h
+        ../shared/visualtestutil.cpp ../shared/visualtestutil.h
+        tst_translation.cpp
+    DEFINES
+        QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\"
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::QuickControls2
+        Qt::QuickPrivate
+        Qt::QuickTemplates2Private
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set(qmake_immediate_resource_files
+    "qml_jp.qm"
+    "qtbase_fr.qm"
+)
+
+qt_add_resource(tst_translation "qmake_immediate"
+    PREFIX
+        "/"
+    FILES
+        ${qmake_immediate_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:translation.pro:<TRUE>:
+# OTHER_FILES = "data/*.qml"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(tst_translation CONDITION ANDROID OR IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\":/data\\\"
+)
+
+qt_extend_target(tst_translation CONDITION NOT ANDROID AND NOT IOS
+    DEFINES
+        QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\"
+)