From 3ffdcc28655a7be543d99e889dd2b7e5dffe1182 Mon Sep 17 00:00:00 2001 From: Shaun Reed Date: Tue, 20 Jan 2026 12:43:45 -0500 Subject: [PATCH] [gui] Update cxx-qt dependencies to 0.8.0. --- Cargo.lock | 56 +++++++++++++++++++----------------------------------- Cargo.toml | 6 +++--- build.rs | 43 ++++++++++++++++++----------------------- 3 files changed, 42 insertions(+), 63 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 50acfb9..c9fc058 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -467,9 +467,9 @@ dependencies = [ [[package]] name = "cxx-qt" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4ce9106b3ee7ef85f77d5f69ec30ec3037ea1edacd3e29a61b26ff47ecc637" +checksum = "ec7c6dea4b551221e1df4349af7ae6af2c906c16860bdab5cada5a957b43cbbc" dependencies = [ "cxx", "cxx-qt-build", @@ -481,9 +481,9 @@ dependencies = [ [[package]] name = "cxx-qt-build" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a7884708e645dc34a2c475bd8c505a2ffeb7c9cb0843f5c580c002c939ea30" +checksum = "c70cbc19fb351a0413632b326ad4862baea7f50d641d2d360b29ad0f772547bc" dependencies = [ "cc", "codespan-reporting 0.11.1", @@ -494,17 +494,17 @@ dependencies = [ "quote", "serde", "serde_json", - "version_check", ] [[package]] name = "cxx-qt-gen" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6b431dc58e4a9b7a55b675be0941331cc2cab0a494e4742ebf7bb393c3fc39" +checksum = "33744d84f696836347071ad73da233f758f98e5c0b348e2855140173b36bffa2" dependencies = [ "clang-format", "convert_case 0.6.0", + "cxx-gen", "indoc", "proc-macro2", "quote", @@ -513,9 +513,9 @@ dependencies = [ [[package]] name = "cxx-qt-lib" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527b46c28be6bf3dd02f1567706641fe247a8798defab8268c84602955741217" +checksum = "7eacfc219a287c422619b7704166bfd3b9b842367bd9124ad5557e6150a2d658" dependencies = [ "cxx", "cxx-qt", @@ -525,12 +525,13 @@ dependencies = [ [[package]] name = "cxx-qt-macro" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "971d8811fd1c8dd06c17284edcfc8e9663dac30d7e3d52159405f836a81923f1" +checksum = "3cb8ce32a983d56470101ff8e61c8a700ba37805b6e942186c6f3dd5d6ad44f6" dependencies = [ "cxx-qt-gen", "proc-macro2", + "quote", "syn 2.0.114", ] @@ -984,15 +985,6 @@ version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.14.0" @@ -1564,13 +1556,15 @@ dependencies = [ [[package]] name = "qt-build-utils" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63c7e24653d0b3084180066306b26e532b152470b13a050c2d2960284d4b9f53" +checksum = "0cfd41d4f115dfc940ea3ea31b3aed77233ad09ab8859a227ed61323025590af" dependencies = [ + "anyhow", "cc", + "semver", + "serde", "thiserror 1.0.69", - "versions", ] [[package]] @@ -1642,7 +1636,7 @@ dependencies = [ "compact_str", "hashbrown", "indoc", - "itertools 0.14.0", + "itertools", "kasuari", "lru", "strum", @@ -1694,7 +1688,7 @@ dependencies = [ "hashbrown", "indoc", "instability", - "itertools 0.14.0", + "itertools", "line-clipping", "ratatui-core", "strum", @@ -2198,7 +2192,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b380a1238663e5f8a691f9039c73e1cdae598a30e9855f541d29b08b53e9a5" dependencies = [ - "itertools 0.14.0", + "itertools", "unicode-segmentation", "unicode-width 0.2.2", ] @@ -2239,16 +2233,6 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" -[[package]] -name = "versions" -version = "6.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f25d498b63d1fdb376b4250f39ab3a5ee8d103957346abacd911e2d8b612c139" -dependencies = [ - "itertools 0.13.0", - "nom", -] - [[package]] name = "vtparse" version = "0.6.2" diff --git a/Cargo.toml b/Cargo.toml index 1c9c448..a002f91 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,8 +5,8 @@ edition = "2024" [dependencies] cxx = "1.0.95" -cxx-qt = "0.7" -cxx-qt-lib = { version="0.7", features = ["qt_full", "qt_gui"] } +cxx-qt = "0.8.0" +cxx-qt-lib = { version = "0.8.0", features = ["qt_full", "qt_gui", "qt_qml"] } log = { version = "0.4.27", features = [] } dirs = "6.0.0" syntect = "5.2.0" @@ -18,4 +18,4 @@ edtui = "0.11.1" [build-dependencies] # The link_qt_object_files feature is required for statically linking Qt 6. -cxx-qt-build = { version = "0.7", features = [ "link_qt_object_files" ] } +cxx-qt-build = { version = "0.8.0", features = ["link_qt_object_files"] } diff --git a/build.rs b/build.rs index 87a98ba..1d20876 100644 --- a/build.rs +++ b/build.rs @@ -1,28 +1,23 @@ use cxx_qt_build::{CxxQtBuilder, QmlModule}; 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 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") - .qt_module("Gui") - .qt_module("Svg") - .qt_module("Xml") - .qml_module(QmlModule { - uri: "clide.module", - rust_files: &["src/gui/colors.rs", "src/gui/filesystem.rs"], - qml_files: &[ - "qml/main.qml", - "qml/ClideAboutWindow.qml", - "qml/ClideTreeView.qml", - "qml/ClideProjectView.qml", - "qml/ClideEditor.qml", - "qml/ClideMenuBar.qml", - ], - ..Default::default() - }) - .build(); + CxxQtBuilder::new_qml_module(QmlModule::new("clide.module").qml_files(&[ + "qml/main.qml", + "qml/ClideAboutWindow.qml", + "qml/ClideTreeView.qml", + "qml/ClideProjectView.qml", + "qml/ClideEditor.qml", + "qml/ClideMenuBar.qml", + ])) + // Link Qt's Network library + // - Qt Core is always linked + // - 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") + .qt_module("Gui") + .qt_module("Svg") + .qt_module("Xml") + .files(["src/gui/colors.rs", "src/gui/filesystem.rs"]) + .build(); }