qt-build-utils: fix docs and add new method with QtInstallation arg

Author: ahayzen-kdab

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

@@ -1119,8 +1119,10 @@ extern "C" bool {init_fun}() {{
 
         let header_root = dir::header_root();
 
-        let mut qtbuild = qt_build_utils::QtBuild::new(qt_modules.iter().cloned().collect())
-            .expect("Could not find Qt installation");
+        let mut qtbuild = qt_build_utils::QtBuild::new_with_default_installation(
+            qt_modules.iter().cloned().collect(),
+        )
+        .expect("Could not find Qt installation");
         qtbuild.cargo_link_libraries(&mut self.cc_builder);
         Self::define_qt_version_cfg_variables(qtbuild.version());
 

crates/cxx-qt-lib/build.rs

@@ -99,7 +99,7 @@ fn write_headers() {
 }
 
 fn main() {
-    let qtbuild = qt_build_utils::QtBuild::new(vec!["Core".to_owned()])
+    let qtbuild = qt_build_utils::QtBuild::new_with_default_installation(vec!["Core".to_owned()])
         .expect("Could not find Qt installation");
 
     write_headers();

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

@@ -13,14 +13,46 @@ use std::{
 
 use crate::{parse_cflags, utils, QtBuildError, QtInstallation, QtTool};
 
-/// TODO
+/// A implementation of [QtInstallation] using qmake
 pub struct QtInstallationQMake {
     qmake_path: PathBuf,
     qmake_version: Version,
 }
 
 impl QtInstallationQMake {
-    /// TODO
+    /// The directories specified by the `PATH` environment variable are where qmake is
+    /// searched for. Alternatively, the `QMAKE` environment variable may be set to specify
+    /// an explicit path to qmake.
+    ///
+    /// If multiple major versions (for example, `5` and `6`) of Qt could be installed, set
+    /// the `QT_VERSION_MAJOR` environment variable to force which one to use. When using Cargo
+    /// as the build system for the whole build, prefer using `QT_VERSION_MAJOR` over the `QMAKE`
+    /// environment variable because it will account for different names for the qmake executable
+    /// that some Linux distributions use.
+    ///
+    /// However, when building a Rust staticlib that gets linked to C++ code by a C++ build
+    /// system, it is best to use the `QMAKE` environment variable to ensure that the Rust
+    /// staticlib is linked to the same installation of Qt that the C++ build system has
+    /// detected.
+    /// With CMake, this will automatically be set up for you when using cxxqt_import_crate.
+    ///
+    /// Alternatively, you can get this from the `Qt::qmake` target's `IMPORTED_LOCATION`
+    /// property, for example:
+    /// ```cmake
+    /// find_package(Qt6 COMPONENTS Core)
+    /// if(NOT Qt6_FOUND)
+    ///     find_package(Qt5 5.15 COMPONENTS Core REQUIRED)
+    /// endif()
+    /// get_target_property(QMAKE Qt::qmake IMPORTED_LOCATION)
+    ///
+    /// execute_process(
+    ///     COMMAND cmake -E env
+    ///         "CARGO_TARGET_DIR=${CMAKE_CURRENT_BINARY_DIR}/cargo"
+    ///         "QMAKE=${QMAKE}"
+    ///         cargo build
+    ///     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    /// )
+    /// ```
     pub fn new() -> anyhow::Result<Self> {
         // Try the QMAKE variable first
         println!("cargo::rerun-if-env-changed=QMAKE");

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

@@ -236,58 +236,31 @@ pub struct QtBuild {
 }
 
 impl QtBuild {
-    /// Search for where Qt is installed using qmake. Specify the Qt modules you are
-    /// linking with the `qt_modules` parameter, ommitting the `Qt` prefix (`"Core"`
-    /// rather than `"QtCore"`). After construction, use the [QtBuild::qmake_query]
-    /// method to get information about the Qt installation.
-    ///
-    /// The directories specified by the `PATH` environment variable are where qmake is
-    /// searched for. Alternatively, the `QMAKE` environment variable may be set to specify
-    /// an explicit path to qmake.
-    ///
-    /// If multiple major versions (for example, `5` and `6`) of Qt could be installed, set
-    /// the `QT_VERSION_MAJOR` environment variable to force which one to use. When using Cargo
-    /// as the build system for the whole build, prefer using `QT_VERSION_MAJOR` over the `QMAKE`
-    /// environment variable because it will account for different names for the qmake executable
-    /// that some Linux distributions use.
-    ///
-    /// However, when building a Rust staticlib that gets linked to C++ code by a C++ build
-    /// system, it is best to use the `QMAKE` environment variable to ensure that the Rust
-    /// staticlib is linked to the same installation of Qt that the C++ build system has
-    /// detected.
-    /// With CMake, this will automatically be set up for you when using cxxqt_import_crate.
-    ///
-    /// Alternatively, you can get this from the `Qt::qmake` target's `IMPORTED_LOCATION`
-    /// property, for example:
-    /// ```cmake
-    /// find_package(Qt6 COMPONENTS Core)
-    /// if(NOT Qt6_FOUND)
-    ///     find_package(Qt5 5.15 COMPONENTS Core REQUIRED)
-    /// endif()
-    /// get_target_property(QMAKE Qt::qmake IMPORTED_LOCATION)
-    ///
-    /// execute_process(
-    ///     COMMAND cmake -E env
-    ///         "CARGO_TARGET_DIR=${CMAKE_CURRENT_BINARY_DIR}/cargo"
-    ///         "QMAKE=${QMAKE}"
-    ///         cargo build
-    ///     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    /// )
-    /// ```
-    pub fn new(mut qt_modules: Vec<String>) -> anyhow::Result<Self> {
-        if qt_modules.is_empty() {
-            qt_modules.push("Core".to_string());
-        }
-
+    /// Create a [QtBuild] using the default [QtInstallation] (currently uses [QtInstallationQMake])
+    /// and specify which Qt modules you are linking, ommitting the `Qt` prefix (`"Core"`
+    /// rather than `"QtCore"`).
+    //
+    // TODO: is there a better name for this method or a sane way to create a default QtInstallation?
+    pub fn new_with_default_installation(qt_modules: Vec<String>) -> anyhow::Result<Self> {
         #[cfg(feature = "qmake")]
         let qt_installation = Box::new(QtInstallationQMake::new()?);
         #[cfg(not(feature = "qmake"))]
         unsupported!("Only qmake feature is supported");
 
-        Ok(Self {
+        Ok(Self::new(qt_installation, qt_modules))
+    }
+
+    /// Create a [QtBuild] using the given [QtInstallation] and specify which
+    /// Qt modules you are linking, ommitting the `Qt` prefix (`"Core"` rather than `"QtCore"`).
+    pub fn new(qt_installation: Box<dyn QtInstallation>, mut qt_modules: Vec<String>) -> Self {
+        if qt_modules.is_empty() {
+            qt_modules.push("Core".to_string());
+        }
+
+        Self {
             qt_installation,
             qt_modules,
-        })
+        }
     }
 
     /// Tell Cargo to link each Qt module.

tests/qt_types_standalone/rust/build.rs

@@ -6,7 +6,7 @@
 use cxx_qt_build::CxxQtBuilder;
 
 fn main() {
-    let qtbuild = qt_build_utils::QtBuild::new(vec!["Core".to_owned()])
+    let qtbuild = qt_build_utils::QtBuild::new_with_default_installation(vec!["Core".to_owned()])
         .expect("Could not find Qt installation");
 
     let mut builder = CxxQtBuilder::new()