qt-build-utils: add error for when a version is requested and no match is found

Author: ahayzen-kdab

crates/qt-build-utils/src/error.rs

@@ -19,6 +19,14 @@ pub enum QtBuildError {
     /// Qt was not found
     #[error("Could not find Qt")]
     QtMissing,
+    /// Qt was not found within the version requirements
+    #[error("Could not find matching Qt install for requested version(s): {1} from available local version(s): {0}", .available_versions.iter().map(|version| version.to_string()).collect::<Vec<_>>().join(", "), .requested_versions.iter().map(|version| version.to_string()).collect::<Vec<_>>().join(", "))]
+    QtMissingVersion {
+        /// The Qt versions found locally
+        available_versions: Vec<semver::Version>,
+        /// The Qt versions requested
+        requested_versions: Vec<semver::Version>,
+    },
     /// Executing `qmake -query` failed
     #[error("Executing `qmake -query` failed: {0:?}")]
     QmakeFailed(#[from] std::io::Error),

crates/qt-build-utils/src/installation/qt_minimal/artifact.rs

@@ -14,7 +14,7 @@ pub(crate) struct ParsedQtManifest {
     pub(crate) artifacts: Vec<ParsedQtArtifact>,
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 /// Descriptor for a Qt artifact, included download information
 pub(crate) struct ParsedQtArtifact {
     pub(crate) version: Version,

crates/qt-build-utils/src/lib.rs

@@ -122,6 +122,9 @@ impl QtBuild {
                 }
             }
 
+            #[cfg(feature = "qt_version")]
+            let mut local_versions = std::collections::BTreeSet::new();
+
             // Auto determining Qt version from crates is enabled
             #[cfg(feature = "qt_version")]
             {
@@ -135,6 +138,8 @@ impl QtBuild {
                         if versions.contains(&qt_installation.version()) {
                             return Ok(Box::new(qt_installation));
                         }
+
+                        local_versions.insert(qt_installation.version());
                     }
                 }
 
@@ -145,7 +150,7 @@ impl QtBuild {
                     if let Ok(local_artifacts) = QtInstallationQtMinimal::local_artifacts() {
                         // Find artifacts with the version range for our OS and arch
                         let artifacts = QtInstallationQtMinimal::match_artifact_requirements(
-                            local_artifacts,
+                            local_artifacts.clone(),
                             &versions,
                         );
 
@@ -165,6 +170,9 @@ impl QtBuild {
                                 return Ok(Box::new(qt_installation));
                             }
                         }
+
+                        local_versions
+                            .extend(local_artifacts.into_iter().map(|artifact| artifact.version));
                     }
 
                     // Download from Qt artifacts
@@ -195,6 +203,16 @@ impl QtBuild {
                 // so we do not need to check for qt_minimal
             }
 
+            #[cfg(feature = "qt_version")]
+            {
+                Err(QtBuildError::QtMissingVersion {
+                    available_versions: local_versions.into_iter().collect(),
+                    requested_versions: qt_version::qt_versions(),
+                }
+                .into())
+            }
+
+            #[cfg(not(feature = "qt_version"))]
             Err(QtBuildError::QtMissing.into())
         };