Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename full_qt feature to qt_full. #1089

Merged
merged 1 commit into from
Oct 8, 2024
Merged

Rename full_qt feature to qt_full. #1089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/cxx-qt-lib-extras/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions crates/cxx-qt-lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down
4 changes: 2 additions & 2 deletions examples/cargo_without_cmake/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion examples/demo_threading/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/qml_features/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion examples/qml_minimal/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading