Merge remote-tracking branch 'origin/dev' into 6.2

Change-Id: I033c245eeb793db5e4e6aa7324bc0cc0aa4e5730

4 files changed, 11 insertions, 20 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec2731d6b..1a8538b1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,6 +13,9 @@ project(QtMultimedia
 # Make sure we only use latest private CMake API, aka no compatibility wrappers.
 set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE)
 
+# Make sure we use the fixed BASE argument of qt_add_resource.
+set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE)
+
 find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core)
 find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui Network Widgets Quick Qml QuickTest QuickControls2)
 
diff --git a/dependencies.yaml b/dependencies.yaml
index 0ad56ae45..1a85788c4 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,13 +1,13 @@
 dependencies:
   ../qtbase:
-    ref: ab52b176f49c93b21e89710eb930cf55a91964d6
+    ref: 33aa461ec96201a2d32ce4ec80319f75878fed60
     required: true
   ../qtshadertools:
-    ref: 23b2410ef1be3bf49008c17ee52daf2c6d6e383d
+    ref: 37f9bda06d422a4a0945ce645459d7068455e2bb
     required: false
   ../qtdeclarative:
-    ref: 9fafa0652c169314043ec3928d7c3ba33f9c3ae8
+    ref: 9a9ff0df09eecaaed577860025bf77e38824245f
     required: false
   ../qtquickcontrols2:
-    ref: c52710c10c4ec975a24fcb29799522d9dfdeac2f
+    ref: df50add85c1f2dd72cf4e8f4d5911a44e8833173
     required: false
diff --git a/examples/multimedia/video/qmlvideo/CMakeLists.txt b/examples/multimedia/video/qmlvideo/CMakeLists.txt
index 3aeab9731..d2e9e1f4d 100644
--- a/examples/multimedia/video/qmlvideo/CMakeLists.txt
+++ b/examples/multimedia/video/qmlvideo/CMakeLists.txt
@@ -119,11 +119,8 @@ qt6_add_resources(qmlvideo "qmlvideo"
     FILES
         ${qmlvideo_resource_files}
 )
-set_source_files_properties("../snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml"
-    PROPERTIES QT_RESOURCE_ALIAS "qml/frequencymonitor/FrequencyItem.qml"
-)
 set(frequencymonitordeclarative_resource_files
-    "qml/frequencymonitor/FrequencyItem.qml"
+    "../snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml"
 )
 
 qt6_add_resources(qmlvideo "frequencymonitordeclarative"
@@ -134,11 +131,8 @@ qt6_add_resources(qmlvideo "frequencymonitordeclarative"
     FILES
         ${frequencymonitordeclarative_resource_files}
 )
-set_source_files_properties("../snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml"
-    PROPERTIES QT_RESOURCE_ALIAS "qml/performancemonitor/PerformanceItem.qml"
-)
 set(performancemonitordeclarative_resource_files
-    "qml/performancemonitor/PerformanceItem.qml"
+    "../snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml"
 )
 
 qt6_add_resources(qmlvideo "performancemonitordeclarative"
diff --git a/examples/multimedia/video/qmlvideofx/CMakeLists.txt b/examples/multimedia/video/qmlvideofx/CMakeLists.txt
index 103e259ee..c833d82f5 100644
--- a/examples/multimedia/video/qmlvideofx/CMakeLists.txt
+++ b/examples/multimedia/video/qmlvideofx/CMakeLists.txt
@@ -130,11 +130,8 @@ qt6_add_resources(qmlvideofx "qmlvideofx"
     FILES
         ${qmlvideofx_resource_files}
 )
-set_source_files_properties("../snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml"
-    PROPERTIES QT_RESOURCE_ALIAS "qml/frequencymonitor/FrequencyItem.qml"
-)
 set(frequencymonitordeclarative_resource_files
-    "qml/frequencymonitor/FrequencyItem.qml"
+    "../snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml"
 )
 
 qt6_add_resources(qmlvideofx "frequencymonitordeclarative"
@@ -145,11 +142,8 @@ qt6_add_resources(qmlvideofx "frequencymonitordeclarative"
     FILES
         ${frequencymonitordeclarative_resource_files}
 )
-set_source_files_properties("../snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml"
-    PROPERTIES QT_RESOURCE_ALIAS "qml/performancemonitor/PerformanceItem.qml"
-)
 set(performancemonitordeclarative_resource_files
-    "qml/performancemonitor/PerformanceItem.qml"
+    "../snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml"
 )
 
 qt6_add_resources(qmlvideofx "performancemonitordeclarative"