From 050a93a002e975fdb87e65db7e5ad6e73e42657d Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Mon, 7 Oct 2024 11:03:38 +0200 Subject: [PATCH] Rename full_qt feature to qt_full. This is in line with our other feature names, like qt_gui, etc. --- crates/cxx-qt-lib-extras/Cargo.toml | 2 +- crates/cxx-qt-lib/Cargo.toml | 4 ++-- examples/cargo_without_cmake/build.rs | 4 ++-- examples/demo_threading/rust/Cargo.toml | 2 +- examples/qml_features/rust/Cargo.toml | 2 +- examples/qml_minimal/rust/Cargo.toml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crates/cxx-qt-lib-extras/Cargo.toml b/crates/cxx-qt-lib-extras/Cargo.toml index 6d4719421..1782d1c87 100644 --- a/crates/cxx-qt-lib-extras/Cargo.toml +++ b/crates/cxx-qt-lib-extras/Cargo.toml @@ -16,7 +16,7 @@ links = "cxx-qt-lib-extras" [dependencies] cxx.workspace = true cxx-qt.workspace = true -cxx-qt-lib = { workspace = true, features = ["full_qt"] } +cxx-qt-lib = { workspace = true, features = ["qt_full"] } [build-dependencies] cxx-qt-build.workspace = true diff --git a/crates/cxx-qt-lib/Cargo.toml b/crates/cxx-qt-lib/Cargo.toml index 43dc4d450..34546a676 100644 --- a/crates/cxx-qt-lib/Cargo.toml +++ b/crates/cxx-qt-lib/Cargo.toml @@ -35,10 +35,10 @@ cxx-qt-build.workspace = true qt-build-utils.workspace = true [features] -full_qt = ["qt_gui", "qt_qml", "qt_quickcontrols"] -full = ["full_qt", "serde", "url", "time", "rgb", "http", "chrono", "bytes"] +full = ["qt_full", "serde", "url", "time", "rgb", "http", "chrono", "bytes"] default = [] +qt_full = ["qt_gui", "qt_qml", "qt_quickcontrols"] qt_gui = [] qt_qml = [] qt_quickcontrols = [] diff --git a/examples/cargo_without_cmake/build.rs b/examples/cargo_without_cmake/build.rs index 79a91b6ad..18f782a3e 100644 --- a/examples/cargo_without_cmake/build.rs +++ b/examples/cargo_without_cmake/build.rs @@ -10,8 +10,8 @@ fn main() { CxxQtBuilder::new() // Link Qt's Network library // - Qt Core is always linked - // - Qt Gui is linked by enabling the qt_gui Cargo feature (default). - // - Qt Qml is linked by enabling the qt_qml Cargo feature (default). + // - Qt Gui is linked by enabling the qt_gui Cargo feature of cxx-qt-lib. + // - Qt Qml is linked by enabling the qt_qml Cargo feature of cxx-qt-lib. // - Qt Qml requires linking Qt Network on macOS .qt_module("Network") .qml_module(QmlModule { diff --git a/examples/demo_threading/rust/Cargo.toml b/examples/demo_threading/rust/Cargo.toml index f6f52fac1..a00dbed3f 100644 --- a/examples/demo_threading/rust/Cargo.toml +++ b/examples/demo_threading/rust/Cargo.toml @@ -16,7 +16,7 @@ crate-type = ["staticlib"] async-std = "1.10" cxx.workspace = true cxx-qt.workspace = true -cxx-qt-lib = { workspace = true, features = ["full_qt"] } +cxx-qt-lib = { workspace = true, features = ["qt_full"] } futures = "0.3" futures-timer = "3.0" serde.workspace = true diff --git a/examples/qml_features/rust/Cargo.toml b/examples/qml_features/rust/Cargo.toml index 52fa5d2d6..9007f80fd 100644 --- a/examples/qml_features/rust/Cargo.toml +++ b/examples/qml_features/rust/Cargo.toml @@ -16,7 +16,7 @@ crate-type = ["staticlib"] [dependencies] cxx.workspace = true cxx-qt.workspace = true -cxx-qt-lib = { workspace = true, features = ["full_qt", "serde"] } +cxx-qt-lib = { workspace = true, features = ["qt_full", "serde"] } serde.workspace = true serde_json.workspace = true diff --git a/examples/qml_minimal/rust/Cargo.toml b/examples/qml_minimal/rust/Cargo.toml index 57e9fc4c6..a4d15b0ac 100644 --- a/examples/qml_minimal/rust/Cargo.toml +++ b/examples/qml_minimal/rust/Cargo.toml @@ -31,7 +31,7 @@ cxx.workspace = true # Use `cxx-qt = "0.6"` here instead! cxx-qt.workspace = true # Use `cxx-qt-lib = "0.6"` here instead! -cxx-qt-lib = { workspace = true, features = ["full_qt"] } +cxx-qt-lib = { workspace = true, features = ["qt_full"] } # ANCHOR_END: book_dependencies # cxx-qt-build generates C++ code from the `#[cxx_qt::bridge]` module