Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prefer qmake6 when available #315

Merged
merged 1 commit into from
Oct 22, 2024
Merged

Prefer qmake6 when available #315

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions qttypes/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ fn qmake_query(var: &str) -> String {
Err(_env_var_err) => {
(|| {
// Some Linux distributions (Fedora, Arch) rename qmake to qmake-qt5.
// qmake6 is somehow an official alias
for qmake in &["qmake", "qmake6", "qmake-qt5"] {
// qmake6 is an official alias that generally always points to the Qt6 version.
for qmake in &["qmake6", "qmake", "qmake-qt5"] {
match Command::new(qmake).args(&["-query", var]).output() {
Err(err) if err.kind() == std::io::ErrorKind::NotFound => continue,
x => return x,
Expand Down
Loading