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

qt-build-utils: default to qmake, qmake6, qmake-qt5 #594

Closed
wants to merge 1 commit into from
Closed

qt-build-utils: default to qmake, qmake6, qmake-qt5 #594

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
9 changes: 4 additions & 5 deletions crates/qt-build-utils/src/lib.rs
View file
Open in desktop
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