Bundling got broken in the revert to Qt 6.6

ankitects · Jan 26, 2025 · c398bac · c398bac
1 parent 92b1144
commit c398bac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/build/configure/src/bundle.rs b/build/configure/src/bundle.rs
@@ -157,13 +157,7 @@ const PRIMARY_VENV: Venv = Venv {
 fn setup_primary_venv(build: &mut Build) -> Result<()> {
     let mut qt6_reqs = inputs![
         "python/requirements.bundle.txt",
-        if cfg!(windows) {
-            "python/requirements.qt6_win.txt"
-        } else if cfg!(target_os = "macos") {
-            "python/requirements.qt6_mac.txt"
-        } else {
-            "python/requirements.qt6_lin.txt"
-        }
+        "python/requirements.qt6_6.txt",
     ];
     if cfg!(windows) {
         qt6_reqs = inputs![qt6_reqs, "python/requirements.win.txt"];

diff --git a/build/configure/src/python.rs b/build/configure/src/python.rs
@@ -20,6 +20,7 @@ use ninja_gen::python::PythonTypecheck;
 use ninja_gen::rsync::RsyncFiles;
 use ninja_gen::Build;
 
+// When updating Qt, make sure to update the .txt file in bundle.rs as well.
 pub fn setup_venv(build: &mut Build) -> Result<()> {
     let platform_deps = if cfg!(windows) {
         inputs![