From 05f864903f01c9d329e15d8252ef3f730007c77d Mon Sep 17 00:00:00 2001 From: Andrew Hayzen Date: Mon, 26 Jun 2023 14:16:54 +0100 Subject: [PATCH] WIP: qt-build-utils: default to qmake, qmake6, qmake-qt5 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 #590 --- crates/qt-build-utils/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/qt-build-utils/src/lib.rs b/crates/qt-build-utils/src/lib.rs index d7bb39004..419530654 100644 --- a/crates/qt-build-utils/src/lib.rs +++ b/crates/qt-build-utils/src/lib.rs @@ -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)) => {