GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 14:02:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Bundling got broken in the revert to Qt 6.6

Browse source
This commit is contained in:
Damien Elmes 2025-01-26 19:32:01 +11:00
parent 92b1144d97
commit c398baca7a
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build/configure/src/bundle.rs
View file

@ -157,13 +157,7 @@ const PRIMARY_VENV: Venv = Venv {
fn setup_primary_venv(build: &mut Build) -> Result<()> { fn setup_primary_venv(build: &mut Build) -> Result<()> {
let mut qt6_reqs = inputs![ let mut qt6_reqs = inputs![
"python/requirements.bundle.txt", "python/requirements.bundle.txt",
if cfg!(windows) { "python/requirements.qt6_6.txt",
"python/requirements.qt6_win.txt"
} else if cfg!(target_os = "macos") {
"python/requirements.qt6_mac.txt"
} else {
"python/requirements.qt6_lin.txt"
}
]; ];
if cfg!(windows) { if cfg!(windows) {
qt6_reqs = inputs![qt6_reqs, "python/requirements.win.txt"]; qt6_reqs = inputs![qt6_reqs, "python/requirements.win.txt"];

1
build/configure/src/python.rs
View file

@ -20,6 +20,7 @@ use ninja_gen::python::PythonTypecheck;
use ninja_gen::rsync::RsyncFiles; use ninja_gen::rsync::RsyncFiles;
use ninja_gen::Build; 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<()> { pub fn setup_venv(build: &mut Build) -> Result<()> {
let platform_deps = if cfg!(windows) { let platform_deps = if cfg!(windows) {
inputs![ inputs![