Skip to content

Commit

Permalink
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.

qt_build_utils also will iterate through the possible qmake
executables and match to the major version.

Related to #590
  • Loading branch information
ahayzen-kdab committed Jun 26, 2023
1 parent 386a7aa commit d013df9
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions 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 All @@ -267,10 +267,9 @@ impl QtBuild {
qt_modules,
});
}
// If QT_VERSION_MAJOR is specified, it is expected that one of the versioned
// executable names will not match, so the unversioned `qmake` needs to be
// attempted last and QtVersionMajorDoesNotMatch should only be returned if
// none of the candidate executable names match.
// If QT_VERSION_MAJOR is specified, it is expected that some of the versioned
// executable names will not match. QtVersionMajorDoesNotMatch should only be
// returned if none of the candidates match.
Err(QtBuildError::QtVersionMajorDoesNotMatch {
qmake_version,
qt_version_major,
Expand Down

0 comments on commit d013df9

Please sign in to comment.