diff --git a/.github/workflows/github-cxx-qt-tests.yml b/.github/workflows/github-cxx-qt-tests.yml index 8578cb06e..de55c6cbf 100644 --- a/.github/workflows/github-cxx-qt-tests.yml +++ b/.github/workflows/github-cxx-qt-tests.yml @@ -59,7 +59,7 @@ jobs: runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v6 - - uses: DavidAnson/markdownlint-cli2-action@v20 + - uses: DavidAnson/markdownlint-cli2-action@v21 with: globs: '**/*.md' diff --git a/README.md b/README.md index 24ab29508..0d492ace0 100644 --- a/README.md +++ b/README.md @@ -63,9 +63,9 @@ Versions below Qt 5.15 LTS are *explicitly unsupported*. ## Comparison to other Rust Qt bindings -| Project | Integrate into C++ codebase | Safe Rust | QML | QWidgets | Maintained1 | Binding mechanism | -|-------- | ---------------------------- | --------- | --- | -------- | ---------------------- | ----------------- | -| CXX-Qt | ✔ | ✔ | ✔ | limited2 | ✔ | [cxx](https://cxx.rs) plus additional code generation to implement QObject subclasses in Rust and bind them to C++ | +| Project | Integrate into C++ codebase | Safe Rust | QML | QWidgets | Maintained1 | Binding mechanism | +| ------- | --------------------------- | --------- | --- | -------- | ---------------------- | ----------------- | +| CXX-Qt | ✔ | ✔ | ✔ | limited2 | ✔ | [cxx](https://cxx.rs) plus additional code generation to implement QObject subclasses in Rust and bind them to C++ | | [qmetaobject](https://github.com/woboq/qmetaobject-rs/) | ✗ | ✔ | ✔ | ✗ | ✔ | [cpp](https://github.com/mystor/rust-cpp) macro to write C++ inline in Rust, plus Rust macros to create QObject subclasses from Rust structs | | [Rust Qt Binding Generator](https://invent.kde.org/sdk/rust-qt-binding-generator) | ✔ | ✔ | ✔ | limited2 | ✗ | generates Rust traits and C++ bindings from JSON description of QObject subclass | | [rust-qt](https://rust-qt.github.io/) | ✗ | ✗ | ✔ | ✔ | ✗ | [ritual](https://rust-qt.github.io/ritual/) to generate unsafe Rust bindings from C++ headers | diff --git a/book/src/concepts/inheritance.md b/book/src/concepts/inheritance.md index 764aa6b43..3e1e8e20d 100644 --- a/book/src/concepts/inheritance.md +++ b/book/src/concepts/inheritance.md @@ -51,9 +51,9 @@ This way methods can be overridden, declared as `virtual` or `final`. | C++ keyword | CXX-Qt attribute | |-------------|-------------------------------| -| `override` | `#[cxx_override]` | -| `virtual` | `#[cxx_virtual]` | -| `final` | `#[cxx_final]` | +| `override` | `#[cxx_override]` | +| `virtual` | `#[cxx_virtual]` | +| `final` | `#[cxx_final]` | The example below overrides the [`data`](https://doc.qt.io/qt-6/qabstractitemmodel.html#data) method inherited from the `QAbstractListModel`.