Skip to content

Commit

Permalink
WIP: qt-build-utils: default to qmake, qmake6, qmake-qt5
Browse files Browse the repository at this point in the history
When using Nix with Qt 6 the output of qmake6 -query is incorrect
and ends up pointing to the incorrect locations. But qmake -query
points to the correct ones.

This solves the issue for Nix but looks like Debian only has
qmake for Qt 5 and qmake6 for Qt 6.

Related to KDAB#590
  • Loading branch information
ahayzen-kdab committed Jun 26, 2023
1 parent 386a7aa commit 05f8649
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion crates/qt-build-utils/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ impl QtBuild {
}

// Fedora 36 renames Qt5's qmake to qmake-qt5
let candidate_executable_names = ["qmake6", "qmake-qt5", "qmake"];
let candidate_executable_names = ["qmake", "qmake6", "qmake-qt5"];
for (index, executable_name) in candidate_executable_names.iter().enumerate() {
match verify_candidate(executable_name) {
Ok((executable_name, version)) => {
Expand Down

0 comments on commit 05f8649

Please sign in to comment.