qt-build-utils: build system changes to have a QtInstallation

Cargo.toml

@@ -59,6 +59,7 @@ cxx-gen = "0.7.121"
 proc-macro2 = "1.0"
 syn = { version = "2.0", features = ["extra-traits", "full"] }
 quote = "1.0"
+semver = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"

crates/cxx-qt-build/Cargo.toml

@@ -21,9 +21,9 @@ proc-macro2.workspace = true
 quote.workspace = true
 qt-build-utils = { workspace = true, features = ["serde"] }
 codespan-reporting = "0.11"
-version_check = "0.9"
 serde.workspace = true
 serde_json = "1.0"
+semver.workspace = true
 
 [features]
 link_qt_object_files = ["qt-build-utils/link_qt_object_files"]

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

@@ -32,8 +32,8 @@ use qml_modules::OwningQmlModule;
 pub use qml_modules::QmlModule;
 
 pub use qt_build_utils::MocArguments;
-use qt_build_utils::SemVer;
 use quote::ToTokens;
+use semver::Version;
 use std::{
     collections::HashSet,
     env,
@@ -600,7 +600,7 @@ impl CxxQtBuilder {
         }
     }
 
-    fn define_qt_version_cfg_variables(version: &SemVer) {
+    fn define_qt_version_cfg_variables(version: Version) {
         // Allow for Qt 5 or Qt 6 as valid values
         CxxQtBuilder::define_cfg_check_variable(
             "cxxqt_qt_version_major".to_owned(),
@@ -702,7 +702,7 @@ impl CxxQtBuilder {
             moc_arguments,
         } in &self.qobject_headers
         {
-            let moc_products = qtbuild.moc(path, moc_arguments.clone());
+            let moc_products = qtbuild.moc().compile(path, moc_arguments.clone());
             // Include the moc folder
             if let Some(dir) = moc_products.cpp.parent() {
                 self.cc_builder.include(dir);
@@ -827,7 +827,7 @@ impl CxxQtBuilder {
                     }
 
                     cc_builder.file(&qobject);
-                    let moc_products = qtbuild.moc(
+                    let moc_products = qtbuild.moc().compile(
                         qobject_header,
                         MocArguments::default().uri(qml_module.uri.clone()),
                     );
@@ -852,8 +852,10 @@ impl CxxQtBuilder {
                 &qml_module.qml_files,
                 &qml_module.qrc_files,
             );
+            if let Some(qmltyperegistrar) = qml_module_registration_files.qmltyperegistrar {
+                cc_builder.file(qmltyperegistrar);
+            }
             cc_builder
-                .file(qml_module_registration_files.qmltyperegistrar)
                 .file(qml_module_registration_files.plugin)
                 // In comparison to the other RCC files, we don't need to link this with whole-archive or
                 // anything like that.
@@ -1030,12 +1032,12 @@ extern "C" bool {init_fun}() {{
             .iter()
             .map(|qrc_file| {
                 // Also ensure that each of the files in the qrc can cause a change
-                for qrc_inner_file in qtbuild.qrc_list(&qrc_file) {
+                for qrc_inner_file in qtbuild.rcc().list(qrc_file) {
                     println!("cargo::rerun-if-changed={}", qrc_inner_file.display());
                 }
                 // We need to link this using an object file or +whole-achive, the static initializer of
                 // the qrc file isn't lost.
-                qtbuild.qrc(&qrc_file)
+                qtbuild.rcc().compile(qrc_file)
             })
             .collect()
     }

crates/qt-build-utils/Cargo.toml

@@ -14,12 +14,15 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
+anyhow = "1.0"
 cc.workspace = true
+semver.workspace = true
 serde = { workspace = true, optional = true }
-versions = "6.3"
 thiserror.workspace = true
 
 [features]
+# TODO: should we default to qmake or let downstream crates specify, such as cxx-qt-build
+default = ["qmake"]
 # When Cargo links an executable, whether a bin crate or test executable,
 # and Qt 6 is linked statically, this feature must be enabled to link
 # unarchived .o files with static symbols that Qt ships (for example
@@ -31,6 +34,7 @@ thiserror.workspace = true
 #
 # When linking Qt dynamically, this makes no difference.
 link_qt_object_files = []
+qmake = []
 serde = ["dep:serde"]
 
 [lints]

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

@@ -0,0 +1,41 @@
+// SPDX-FileCopyrightText: 2025 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
+// SPDX-FileContributor: Andrew Hayzen <[email protected]>
+//
+// SPDX-License-Identifier: MIT OR Apache-2.0
+
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+/// Errors that can occur while using [crate::QtBuild]
+pub enum QtBuildError {
+    /// `QMAKE` environment variable was set but Qt was not detected
+    #[error("QMAKE environment variable specified as {qmake_env_var} but could not detect Qt: {error:?}")]
+    QMakeSetQtMissing {
+        /// The value of the qmake environment variable when the error occurred
+        qmake_env_var: String,
+        /// The inner error that occurred
+        error: Box<anyhow::Error>,
+    },
+    /// Qt was not found
+    #[error("Could not find Qt")]
+    QtMissing,
+    /// Executing `qmake -query` failed
+    #[error("Executing `qmake -query` failed: {0:?}")]
+    QmakeFailed(#[from] std::io::Error),
+    /// `QT_VERSION_MAJOR` environment variable was specified but could not be parsed as an integer
+    #[error("QT_VERSION_MAJOR environment variable specified as {qt_version_major_env_var} but could not parse as integer: {source:?}")]
+    QtVersionMajorInvalid {
+        /// The Qt major version from `QT_VERSION_MAJOR`
+        qt_version_major_env_var: String,
+        /// The [std::num::ParseIntError] when parsing the `QT_VERSION_MAJOR`
+        source: std::num::ParseIntError,
+    },
+    /// `QT_VERSION_MAJOR` environment variable was specified but the Qt version specified by `qmake -query QT_VERSION` did not match
+    #[error("qmake version ({qmake_version}) does not match version specified by QT_VERSION_MAJOR ({qt_version_major})")]
+    QtVersionMajorDoesNotMatch {
+        /// The qmake version
+        qmake_version: u64,
+        /// The Qt major version from `QT_VERSION_MAJOR`
+        qt_version_major: u64,
+    },
+}

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

@@ -0,0 +1,35 @@
+// SPDX-FileCopyrightText: 2025 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
+// SPDX-FileContributor: Andrew Hayzen <[email protected]>
+//
+// SPDX-License-Identifier: MIT OR Apache-2.0
+
+use std::path::PathBuf;
+
+#[doc(hidden)]
+#[derive(Clone)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub struct Initializer {
+    pub file: Option<PathBuf>,
+    pub init_call: Option<String>,
+    pub init_declaration: Option<String>,
+}
+
+impl Initializer {
+    #[doc(hidden)]
+    pub fn default_signature(name: &str) -> Self {
+        Self {
+            file: None,
+            init_call: Some(format!("{name}();")),
+            init_declaration: Some(format!("extern \"C\" bool {name}();")),
+        }
+    }
+
+    #[doc(hidden)]
+    // Strip the init files from the public initializers
+    // For downstream dependencies, it's often enough to just declare the init function and
+    // call it.
+    pub fn strip_file(mut self) -> Self {
+        self.file = None;
+        self
+    }
+}

crates/qt-build-utils/src/installation/mod.rs

@@ -0,0 +1,42 @@
+// SPDX-FileCopyrightText: 2025 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
+// SPDX-FileContributor: Andrew Hayzen <[email protected]>
+//
+// SPDX-License-Identifier: MIT OR Apache-2.0
+
+#[cfg(feature = "qmake")]
+pub(crate) mod qmake;
+
+use semver::Version;
+use std::path::PathBuf;
+
+use crate::QtTool;
+
+/// A Qt Installation that can be used by cxx-qt-build to run Qt related tasks
+///
+/// Note that it is the responsbility of the QtInstallation implementation
+/// to print any cargo::rerun-if-changed lines
+pub trait QtInstallation {
+    /// Return the include paths for Qt, including Qt module subdirectories.
+    ///
+    /// This is intended to be passed to whichever tool you are using to invoke the C++ compiler.
+    fn include_paths(&self, qt_modules: &[String]) -> Vec<PathBuf>;
+    /// Configure the given cc::Build and cargo to link to the given Qt modules
+    ///
+    // TODO: should we hand in a cc::Build or should we instead return a struct
+    // with details of the rustc-link-lib / search paths ? and then have the
+    // calling function apply those and any flags to the cc::Build?
+    // eg return the following?
+    //
+    // pub struct LinkArgs {
+    //     builder_flag_if_supported: Vec<String>,
+    //     builder_object: Vec<String>,
+    //     rustc_link_arg: Vec<String>,
+    //     rustc_link_lib: Vec<String>,
+    //     rustc_link_search: Vec<String>,
+    // }
+    fn link_modules(&self, builder: &mut cc::Build, qt_modules: &[String]);
+    /// Find the path to a given Qt tool for the Qt installation
+    fn try_find_tool(&self, tool: QtTool) -> anyhow::Result<PathBuf>;
+    /// Version of the detected Qt installation
+    fn version(&self) -> Version;
+}