diff --git a/CHANGELOG.md b/CHANGELOG.md index d5c66477a..3bc1058a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased](https://github.com/KDAB/cxx-qt/compare/v0.6.1...HEAD) +## [Unreleased](https://github.com/KDAB/cxx-qt/compare/v0.7.0...HEAD) + +## [0.7.0](https://github.com/KDAB/cxx-qt/compare/v0.6.1...v0.7.0) - 2024-10-30 ### Added diff --git a/Cargo.toml b/Cargo.toml index 032a1bd3f..4321a9b44 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,18 +27,18 @@ resolver = "2" edition = "2021" license = "MIT OR Apache-2.0" repository = "https://github.com/KDAB/cxx-qt/" -version = "0.6.1" +version = "0.7.0" # Note a version needs to be specified on dependencies of packages # we publish, otherwise crates.io complains as it doesn't know the version. [workspace.dependencies] cxx-qt = { path = "crates/cxx-qt" } -cxx-qt-macro = { path = "crates/cxx-qt-macro", version = "0.6.1" } -cxx-qt-build = { path = "crates/cxx-qt-build", version = "0.6.1" } -cxx-qt-gen = { path = "crates/cxx-qt-gen", version = "0.6.1" } -cxx-qt-lib = { path = "crates/cxx-qt-lib", version = "0.6.1" } -qt-build-utils = { path = "crates/qt-build-utils", version = "0.6.1" } -cxx-qt-lib-extras = { path = "crates/cxx-qt-lib-extras", version = "0.6.1" } +cxx-qt-macro = { path = "crates/cxx-qt-macro", version = "0.7.0" } +cxx-qt-build = { path = "crates/cxx-qt-build", version = "0.7.0" } +cxx-qt-gen = { path = "crates/cxx-qt-gen", version = "0.7.0" } +cxx-qt-lib = { path = "crates/cxx-qt-lib", version = "0.7.0" } +qt-build-utils = { path = "crates/qt-build-utils", version = "0.7.0" } +cxx-qt-lib-extras = { path = "crates/cxx-qt-lib-extras", version = "0.7.0" } cc = { version = "1.0.100", features = ["parallel"] } # Ensure that the example comments are kept in sync diff --git a/book/src/getting-started/4-cargo-executable.md b/book/src/getting-started/4-cargo-executable.md index 07c610ca9..97d134565 100644 --- a/book/src/getting-started/4-cargo-executable.md +++ b/book/src/getting-started/4-cargo-executable.md @@ -30,12 +30,12 @@ We'll need `cxx`, `cxx-qt`, `cxx-qt-lib` and `cxx-qt-build`: {{#include ../../../examples/qml_minimal/rust/Cargo.toml:book_package_name}} {{#include ../../../examples/cargo_without_cmake/Cargo.toml:book_cargo_toml_no_cmake}} cxx = "1.0.95" -cxx-qt = "0.6" -cxx-qt-lib = { version="0.6", features = ["qt_full"] } +cxx-qt = "0.7" +cxx-qt-lib = { version="0.7", features = ["qt_full"] } [build-dependencies] # The link_qt_object_files feature is required for statically linking Qt 6. -cxx-qt-build = { version = "0.6", features = [ "link_qt_object_files" ] } +cxx-qt-build = { version = "0.7", features = [ "link_qt_object_files" ] } ``` Now we'll add a `build.rs` script next to the `Cargo.toml` file. diff --git a/book/src/getting-started/5-cmake-integration.md b/book/src/getting-started/5-cmake-integration.md index 790470afe..e0cba8091 100644 --- a/book/src/getting-started/5-cmake-integration.md +++ b/book/src/getting-started/5-cmake-integration.md @@ -77,12 +77,12 @@ In the end, your `Cargo.toml` should look similar to this. [dependencies] cxx = "1.0.95" -cxx-qt = "0.6" -cxx-qt-lib = { version="0.6", features = ["qt_full"] } +cxx-qt = "0.7" +cxx-qt-lib = { version="0.7", features = ["qt_full"] } [build-dependencies] # The link_qt_object_files feature is required for statically linking Qt 6. -cxx-qt-build = { version = "0.6", features = [ "link_qt_object_files" ] } +cxx-qt-build = { version = "0.7", features = [ "link_qt_object_files" ] } ``` We'll then also need to add a script named `build.rs` next to the `Cargo.toml`: @@ -134,7 +134,7 @@ Download CXX-Qts CMake code with FetchContent: ```cmake,ignore {{#include ../../../examples/qml_minimal/CMakeLists.txt:book_cmake_find_cxx_qt_start}} - GIT_TAG v0.6.0 + GIT_TAG v0.7.0 {{#include ../../../examples/qml_minimal/CMakeLists.txt:book_cmake_find_cxx_qt_end}} ``` diff --git a/examples/cargo_without_cmake/Cargo.toml b/examples/cargo_without_cmake/Cargo.toml index 6b665ec88..cf39e21a3 100644 --- a/examples/cargo_without_cmake/Cargo.toml +++ b/examples/cargo_without_cmake/Cargo.toml @@ -22,12 +22,12 @@ license = "MIT OR Apache-2.0" # Use `cxx = "1.0.95"` here instead! cxx.workspace = true -# Use `cxx-qt = "0.6"` here instead! +# Use `cxx-qt = "0.7"` here instead! cxx-qt.workspace = true -# Use `cxx-qt-lib = "0.6"` here instead! +# Use `cxx-qt-lib = "0.7"` here instead! cxx-qt-lib = { workspace = true, features = ["full"] } [build-dependencies] -# Use `cxx-qt-build = "0.6"` here instead! +# Use `cxx-qt-build = "0.7"` here instead! # The link_qt_object_files feature is required for statically linking Qt 6. cxx-qt-build = { workspace = true, features = [ "link_qt_object_files" ] } diff --git a/examples/qml_minimal/rust/Cargo.toml b/examples/qml_minimal/rust/Cargo.toml index a4d15b0ac..75045c06d 100644 --- a/examples/qml_minimal/rust/Cargo.toml +++ b/examples/qml_minimal/rust/Cargo.toml @@ -28,9 +28,9 @@ crate-type = ["staticlib"] [dependencies] # Use `cxx = "1.0.95"` here instead! cxx.workspace = true -# Use `cxx-qt = "0.6"` here instead! +# Use `cxx-qt = "0.7"` here instead! cxx-qt.workspace = true -# Use `cxx-qt-lib = "0.6"` here instead! +# Use `cxx-qt-lib = "0.7"` here instead! cxx-qt-lib = { workspace = true, features = ["qt_full"] } # ANCHOR_END: book_dependencies @@ -38,7 +38,7 @@ cxx-qt-lib = { workspace = true, features = ["qt_full"] } # and compiles it together with the Rust static library # ANCHOR: book_build_dependencies [build-dependencies] -# Use `cxx-qt-build = "0.6"` here instead! +# Use `cxx-qt-build = "0.7"` here instead! cxx-qt-build.workspace = true [features] diff --git a/scripts/release_crates.sh b/scripts/release_crates.sh index 67213014d..ea9a44324 100755 --- a/scripts/release_crates.sh +++ b/scripts/release_crates.sh @@ -47,7 +47,7 @@ function release_crate() { question_yesno "Have you run cargo login before and setup credentials" # cxx-qt-cmake (no dependencies) -question_yesno "Have you created a new tag in the cxx-qt-cmake repo" +question_yesno "Have you bumped the project version (in CMakeLists.txt) and created a new tag in the cxx-qt-cmake repo" # 5-cmake-integration.md has a GIT_TAG example pointing to the stable release question_yesno "Have you updated the GIT_TAG for cxx-qt-cmake in the book"