qt-build-utils: create a QtInstallation but don't use it

This is just to test what we can do still with the old API

Author: ahayzen-kdab

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

@@ -44,7 +44,7 @@ pub enum QtBuildError {
         /// The value of the qmake environment variable when the error occurred
         qmake_env_var: String,
         /// The inner [QtBuildError] that occurred
-        error: Box<QtBuildError>,
+        error: Box<anyhow::Error>,
     },
     /// Qt was not found
     #[error("Could not find Qt")]
@@ -233,6 +233,7 @@ pub struct QmlModuleRegistrationFiles {
 /// let qtbuild = qt_build_utils::QtBuild::new(qt_modules).expect("Could not find Qt installation");
 /// ```
 pub struct QtBuild {
+    qt_installation: Box<dyn QtInstallation>,
     version: SemVer,
     qmake_executable: String,
     moc_executable: Option<String>,
@@ -281,10 +282,16 @@ impl QtBuild {
     ///     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     /// )
     /// ```
-    pub fn new(mut qt_modules: Vec<String>) -> Result<Self, QtBuildError> {
+    pub fn new(mut qt_modules: Vec<String>) -> anyhow::Result<Self> {
         if qt_modules.is_empty() {
             qt_modules.push("Core".to_string());
         }
+
+        #[cfg(feature = "qmake")]
+        let qt_installation = Box::new(QtInstallationQMake::new()?);
+        #[cfg(not(feature = "qmake"))]
+        unsupported!("Only qmake feature is supported");
+
         println!("cargo::rerun-if-env-changed=QMAKE");
         println!("cargo::rerun-if-env-changed=QT_VERSION_MAJOR");
         fn verify_candidate(candidate: &str) -> Result<(&str, versions::SemVer), QtBuildError> {
@@ -338,6 +345,7 @@ impl QtBuild {
             match verify_candidate(qmake_env_var.trim()) {
                 Ok((executable_name, version)) => {
                     return Ok(Self {
+                        qt_installation,
                         qmake_executable: executable_name.to_string(),
                         moc_executable: None,
                         qmltyperegistrar_executable: None,
@@ -350,8 +358,9 @@ impl QtBuild {
                 Err(e) => {
                     return Err(QtBuildError::QMakeSetQtMissing {
                         qmake_env_var,
-                        error: Box::new(e),
-                    })
+                        error: Box::new(e.into()),
+                    }
+                    .into())
                 }
             }
         }
@@ -362,6 +371,7 @@ impl QtBuild {
             match verify_candidate(executable_name) {
                 Ok((executable_name, version)) => {
                     return Ok(Self {
+                        qt_installation,
                         qmake_executable: executable_name.to_string(),
                         moc_executable: None,
                         qmltyperegistrar_executable: None,
@@ -383,17 +393,18 @@ impl QtBuild {
                         return Err(QtBuildError::QtVersionMajorDoesNotMatch {
                             qmake_version,
                             qt_version_major,
-                        });
+                        }
+                        .into());
                     }
                     eprintln!("Candidate qmake executable `{executable_name}` is for Qt{qmake_version} but QT_VERSION_MAJOR environment variable specified as {qt_version_major}. Trying next candidate executable name `{}`...", candidate_executable_names[index + 1]);
                     continue;
                 }
                 Err(QtBuildError::QtMissing) => continue,
-                Err(e) => return Err(e),
+                Err(e) => return Err(e.into()),
             }
         }
 
-        Err(QtBuildError::QtMissing)
+        Err(QtBuildError::QtMissing.into())
     }
 
     /// Get the output of running `qmake -query var_name`
@@ -620,6 +631,7 @@ impl QtBuild {
 
     /// Version of the detected Qt installation
     pub fn version(&self) -> &SemVer {
+        let _ = self.qt_installation.version();
         &self.version
     }
 
@@ -683,6 +695,9 @@ impl QtBuild {
     /// as well as the path to the generated metatypes.json file, which can be passed to [register_qml_module](Self::register_qml_module).
     ///
     pub fn moc(&mut self, input_file: impl AsRef<Path>, arguments: MocArguments) -> MocProducts {
+        let _ = self
+            .qt_installation
+            .moc(input_file.as_ref(), arguments.clone());
         if self.moc_executable.is_none() {
             self.moc_executable = Some(self.get_qt_tool("moc").expect("Could not find moc"));
         }
@@ -1073,6 +1088,7 @@ Q_IMPORT_PLUGIN({plugin_class_name});
     /// the `+whole-archive` flag is used, or the initializer function is called by the
     /// application.
     pub fn qrc(&mut self, input_file: &impl AsRef<Path>) -> Initializer {
+        let _ = self.qt_installation.qrc(input_file.as_ref());
         if self.rcc_executable.is_none() {
             self.rcc_executable = Some(self.get_qt_tool("rcc").expect("Could not find rcc"));
         }