cxx-qt-build: pass in qml modules to opts

This then means we can remove the gui and qml features

Author: ahayzen-kdab

CHANGELOG.md

@@ -37,6 +37,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Missing include for `MaybeLockGuard` when using only `extern "C++Qt"` signals
 
+### Removed
+
+- `qt_gui` and `qt_qml` features from `cxx-qt-build` they are only used in `cxx-qt-lib(-headers)` now
+
 ## [0.6.0](https://github.com/KDAB/cxx-qt/compare/v0.5.3...v0.6.0) - 2023-11-17
 
 ### Added

crates/cxx-qt-build/Cargo.toml

@@ -24,7 +24,4 @@ codespan-reporting = "0.11"
 version_check = "0.9"
 
 [features]
-default = ["qt_gui", "qt_qml"]
-qt_gui = []
-qt_qml = []
 link_qt_object_files = ["qt-build-utils/link_qt_object_files"]

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

@@ -315,17 +315,15 @@ pub struct CxxQtBuildersOpts {
     pub defines: HashSet<String>,
     /// Contents, directory, file name
     pub headers: Vec<(String, String, String)>,
+    /// Qt modules that are required
+    pub qt_modules: HashSet<String>,
 }
 
 impl CxxQtBuilder {
     /// Create a new builder
     pub fn new() -> Self {
         let mut qt_modules = HashSet::new();
         qt_modules.insert("Core".to_owned());
-        #[cfg(feature = "qt_gui")]
-        qt_modules.insert("Gui".to_owned());
-        #[cfg(feature = "qt_qml")]
-        qt_modules.insert("Qml".to_owned());
         Self {
             rust_sources: vec![],
             qobject_headers: vec![],
@@ -374,7 +372,7 @@ impl CxxQtBuilder {
 
     /// Link additional [Qt modules](https://doc.qt.io/qt-6/qtmodules.html).
     /// Specify their names without the `Qt` prefix, for example `"Widgets"`.
-    /// The Core and any feature enabled modules are linked automatically; there is no need to specify them.
+    /// The `Core` module and any modules from [CxxQtBuildersOpts] are linked automatically; there is no need to specify them.
     pub fn qt_module(mut self, module: &str) -> Self {
         self.qt_modules.insert(module.to_owned());
         self
@@ -471,6 +469,9 @@ impl CxxQtBuilder {
         // Add any of the defines
         self.extra_defines.extend(opts.defines);
 
+        // Add any of the Qt modules
+        self.qt_modules.extend(opts.qt_modules);
+
         self
     }
 

crates/cxx-qt-lib-headers/Cargo.toml

@@ -13,8 +13,8 @@ repository.workspace = true
 
 [features]
 default = []
-qt_gui = ["cxx-qt-build/qt_gui"]
-qt_qml = ["cxx-qt-build/qt_qml"]
+qt_gui = []
+qt_qml = []
 
 [dependencies]
 cxx-qt-build.workspace = true

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

@@ -108,9 +108,16 @@ pub fn build_opts() -> cxx_qt_build::CxxQtBuildersOpts {
     }
 
     #[cfg(feature = "qt_gui")]
-    opts.defines.insert("CXX_QT_GUI_FEATURE".to_owned());
+    {
+        opts.defines.insert("CXX_QT_GUI_FEATURE".to_owned());
+        opts.qt_modules.insert("Gui".to_owned());
+    }
+
     #[cfg(feature = "qt_qml")]
-    opts.defines.insert("CXX_QT_QML_FEATURE".to_owned());
+    {
+        opts.defines.insert("CXX_QT_QML_FEATURE".to_owned());
+        opts.qt_modules.insert("Qml".to_owned());
+    }
 
     opts
 }