From c398baca7a8392786805bdf639feea2c538161ac Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sun, 26 Jan 2025 19:32:01 +1100 Subject: [PATCH] Bundling got broken in the revert to Qt 6.6 --- build/configure/src/bundle.rs | 8 +------- build/configure/src/python.rs | 1 + 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/build/configure/src/bundle.rs b/build/configure/src/bundle.rs index ae11455346..50fe7414cc 100644 --- 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 index e577f5f434..ec6f6fb926 100644 --- 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![