Book: Update CXX-Qt dependencies to 0.6

ferrous-systems · Nov 17, 2023 · 5dfdeab · 5dfdeab
1 parent aaee74e
commit 5dfdeab
Show file tree

Hide file tree

Showing 7 changed files with 91 additions and 85 deletions.
diff --git a/book/src/tutorial/qt-gui/build-setup.md b/book/src/tutorial/qt-gui/build-setup.md
@@ -38,47 +38,18 @@ ApplicationWindow {
 ✅ Add dependencies to the `Cargo.toml` file
 ```toml
 [dependencies]
-rustagram2="*"
+rustagram2 = "*"
 image-manipulation = { path = "../image-manipulation" }
 
-cxx="1.0.95"
-cxx-qt = { git="https://github.com/LeonMatthesKDAB/cxx-qt", branch="qimage" }
-cxx-qt-lib = { git="https://github.com/LeonMatthesKDAB/cxx-qt", branch="qimage" }
+cxx = "1.0.95"
+cxx-qt = "0.6"
+cxx-qt-lib = "0.6"
 
 [build-dependencies]
 # The "link_qt_object_files" is required when using Cargo to link to Qt statically.
-cxx-qt-build = { git="https://github.com/LeonMatthesKDAB/cxx-qt", branch="qimage", features = [ "qt_qml", "link_qt_object_files" ] } 
+cxx-qt-build = { version = "0.6", features = [ "qt_qml", "link_qt_object_files" ] } 
 ```
 
-```diff
-- At the time of writing (17.11.2023), CXX-Qt 0.6 hasn't been released yet.
-- To keep the training material up-to-date with the new API introduced in version 0.6,
-- we'll use the version from Github for now.
-- The training material on Github will be updated as soon as version 0.6 is released!
-
-- Do note that the public documentation for CXX-Qt is still for version 0.5.
-- You should wait before following this tutorial until version 0.6 is
-- released in the coming weeks.
-```
-
-<details>
-<summary> Future imports once CXX-Qt 0.6 is released </summary>
-
-```toml
-[dependencies]
-rustagram2="*"
-image-manipulation = { path = "../image-manipulation" }
-
-cxx="1.0.95"
-cxx-qt="0.6"
-cxx-qt-lib="0.6"
-
-[build-dependencies]
-# The "link_qt_object_files" is required when using Cargo to link to Qt statically.
-cxx-qt-build = { version="0.6", features = [ "qt_qml", "link_qt_object_files" ] } 
-```
-</details>
-
 CXX-Qt is split up into multiple crates.
 * CXX-Qt - Allows you to create QObjects from Rust and to interact with existing QObjects
 * CXX-Qt-lib - Library of bindings to Qt types like `QString`, `QApplication`, etc.

diff --git a/crates/qt-gui-qquickpainteditem/Cargo.lock b/crates/qt-gui-qquickpainteditem/Cargo.lock
diff --git a/crates/qt-gui-qquickpainteditem/Cargo.toml b/crates/qt-gui-qquickpainteditem/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2021"
 
 [dependencies]
 cxx = "1.0.95"
-cxx-qt = { git = "https://github.com/LeonMatthesKDAB/cxx-qt", branch = "qimage" }
-cxx-qt-lib = { git = "https://github.com/LeonMatthesKDAB/cxx-qt", branch = "qimage" }
+cxx-qt = "0.6"
+cxx-qt-lib = "0.6"
 
 [build-dependencies]
-cxx-qt-build = { git = "https://github.com/LeonMatthesKDAB/cxx-qt", branch = "qimage", features = [ "qt_qml", "link_qt_object_files" ] } 
+cxx-qt-build = { version = "0.6", features = [ "qt_qml", "link_qt_object_files" ] } 
diff --git a/crates/qt-hello-world/Cargo.lock b/crates/qt-hello-world/Cargo.lock
diff --git a/crates/qt-hello-world/Cargo.toml b/crates/qt-hello-world/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cxx-qt = { git="https://github.com/kdab/cxx-qt" }
-cxx-qt-lib = { git="https://github.com/kdab/cxx-qt" }
+cxx-qt = "0.6"
+cxx-qt-lib = "0.6"
 
 [build-dependencies]
-cxx-qt-build = { git="https://github.com/kdab/cxx-qt", features = [ "qt_qml", "link_qt_object_files" ] } 
+cxx-qt-build = { version = "0.6", features = [ "qt_qml", "link_qt_object_files" ] } 
diff --git a/crates/with-workspace/Cargo.lock b/crates/with-workspace/Cargo.lock
diff --git a/crates/with-workspace/qt-gui/Cargo.toml b/crates/with-workspace/qt-gui/Cargo.toml
@@ -10,8 +10,8 @@ rustagram2="*"
 image-manipulation = { path = "../image-manipulation" }
 
 cxx = "1.0.95"
-cxx-qt = { git = "https://github.com/LeonMatthesKDAB/cxx-qt", branch = "qimage" }
-cxx-qt-lib = { git = "https://github.com/LeonMatthesKDAB/cxx-qt", branch = "qimage" }
+cxx-qt = "0.6"
+cxx-qt-lib = "0.6"
 
 [build-dependencies]
-cxx-qt-build = { git = "https://github.com/LeonMatthesKDAB/cxx-qt", branch = "qimage", features = [ "qt_qml", "link_qt_object_files" ] } 
+cxx-qt-build = { version = "0.6", features = [ "qt_qml", "link_qt_object_files" ] }