qt-build-utils: use which to find full qmake path

Author: ahayzen-kdab

Cargo.lock

@@ -27,6 +27,7 @@ tar = { version = "0.4.44", optional = true }
 flate2 = { version = "1.1.9", optional = true }
 qt-artifacts = { version = "0.1.0", optional = true }
 qt-version = { version = "0.1.3", default-features = false, optional = true }
+which = { version = "8.0.0", optional = true }
 
 [features]
 # TODO: should we default to qmake or let downstream crates specify, such as cxx-qt-build
@@ -42,7 +43,7 @@ default = ["qmake"]
 #
 # When linking Qt dynamically, this makes no difference.
 link_qt_object_files = []
-qmake = []
+qmake = ["dep:which"]
 qt_minimal = ["qt_version", "dep:serde", "serde/derive", "semver/serde", "dep:reqwest", "dep:sha2", "dep:tempfile", "dep:serde_json", "dep:flate2", "dep:tar", "dep:qt-artifacts", "dep:dirs"]
 qt_version = ["dep:qt-version"]
 serde = ["dep:serde"]

crates/qt-build-utils/Cargo.toml

@@ -74,16 +74,20 @@ impl QtInstallationQMake {
             // Use the first non-errored installation
             // If there are no valid installations we display the last error
             .fold(None, |acc, qmake_path| {
-                Some(acc.map_or_else(
-                    // Value is None so try to create installation
-                    || QtInstallationQMake::try_from(PathBuf::from(qmake_path)),
-                    // Value is Some so pass through or create if Err
-                    |prev: anyhow::Result<Self>| {
-                        prev.or_else(|_|
+                if let Ok(qmake_path) = which::which(qmake_path) {
+                    Some(acc.map_or_else(
+                        // Value is None so try to create installation
+                        || QtInstallationQMake::try_from(qmake_path.clone()),
+                        // Value is Some so pass through or create if Err
+                        |prev: anyhow::Result<Self>| {
+                            prev.or_else(|_|
                             // Value is Err so try to create installation
-                            QtInstallationQMake::try_from(PathBuf::from(qmake_path)))
-                    },
-                ))
+                            QtInstallationQMake::try_from(qmake_path.clone()))
+                        },
+                    ))
+                } else {
+                    None
+                }
             })
             .unwrap_or_else(|| Err(QtBuildError::QtMissing.into()))
     }