Merge branch 'main' into add_qcommandlineoption_support

Montel · web-flow · commit d23f9778fa78 · 2023-11-28T12:31:51.000+01:00
diff --git a/crates/qt-build-utils/src/lib.rs b/crates/qt-build-utils/src/lib.rs
@@ -636,7 +636,7 @@ prefer :/qt/qml/{qml_uri_dirs}/
         }
 
         // Generate .qrc file and run rcc on it
-        let qrc_path = format!("{qml_module_dir}/qml_module_resources.qrc");
+        let qrc_path = format!("{qml_module_dir}/qml_module_resources_{qml_uri_underscores}.qrc");
         {
             fn qrc_file_line(file_path: &impl AsRef<Path>) -> String {
                 let path_display = file_path.as_ref().display();

Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,7 @@ prefer :/qt/qml/{qml_uri_dirs}/`
`636`	`636`	`}`
`637`	`637`
`638`	`638`	`// Generate .qrc file and run rcc on it`
`639`		`- let qrc_path = format!("{qml_module_dir}/qml_module_resources.qrc");`
	`639`	`+ let qrc_path = format!("{qml_module_dir}/qml_module_resources_{qml_uri_underscores}.qrc");`
`640`	`640`	`{`
`641`	`641`	`fn qrc_file_line(file_path: &impl AsRef<Path>) -> String {`
`642`	`642`	`let path_display = file_path.as_ref().display();`