Skip to content

Commit 4c34a2d

Browse files
committed
Fix Windows bundling
Missed in the Qt6.8 changes
1 parent 1fb1cbb commit 4c34a2d

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

qt/bundle/win/src/main.rs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,15 @@ struct Args {
2323
version: String,
2424
bundle_root: Utf8PathBuf,
2525
qt6_setup_path: Utf8PathBuf,
26-
qt5_setup_path: Utf8PathBuf,
2726
}
2827

2928
fn main() -> Result<()> {
3029
let args = Args::parse();
3130

3231
let src_win_folder = Utf8Path::new("qt/bundle/win");
3332
let std_dist_folder = args.bundle_root.join("std");
34-
let alt_dist_folder = args.bundle_root.join("alt");
3533
// folder->installer
36-
let dists = [
37-
(&std_dist_folder, &args.qt6_setup_path),
38-
(&alt_dist_folder, &args.qt5_setup_path),
39-
];
34+
let dists = [(&std_dist_folder, &args.qt6_setup_path)];
4035

4136
for (folder, _) in dists {
4237
fs::copy(
@@ -56,16 +51,12 @@ fn main() -> Result<()> {
5651
)
5752
.context("uninstaller")?;
5853

59-
// sign the anki.exe and uninstaller.exe in std, then copy into alt
54+
// sign the anki.exe and uninstaller.exe in std
6055
println!("--- Sign binaries");
6156
codesign([
6257
&std_dist_folder.join("anki.exe"),
6358
&std_dist_folder.join("uninstall.exe"),
6459
])?;
65-
for fname in &["anki.exe", "uninstall.exe"] {
66-
fs::copy(std_dist_folder.join(fname), alt_dist_folder.join(fname))
67-
.with_context(|| format!("copy {fname}"))?;
68-
}
6960

7061
println!("--- Build manifest");
7162
for (folder, _) in dists {

0 commit comments

Comments
 (0)