Remove cxx-qt-lib-headers crate

This is now part of cxx-qt-lib and exported from there
KDAB · Jul 9, 2024 · fca89e1 · fca89e1
1 parent 410f494
commit fca89e1
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 168 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,7 +9,6 @@ members = [
     "crates/cxx-qt-build",
     "crates/cxx-qt-gen",
     "crates/cxx-qt-lib",
-    "crates/cxx-qt-lib-headers",
     "crates/qt-build-utils",
     "crates/cxx-qt-lib-extras-headers",
     "crates/cxx-qt-lib-extras",
@@ -39,7 +38,6 @@ 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" }
-cxx-qt-lib-headers = { path = "crates/cxx-qt-lib-headers", version = "0.6.1" }
 qt-build-utils = { path = "crates/qt-build-utils", version = "0.6.1" }
 cxx-qt-lib-extras-headers = { path = "crates/cxx-qt-lib-extras-headers", version = "0.6.1" }
 cxx-qt-lib-extras = { path = "crates/cxx-qt-lib-extras", version = "0.6.1" }

diff --git a/crates/cxx-qt-lib-extras/Cargo.toml b/crates/cxx-qt-lib-extras/Cargo.toml
@@ -18,7 +18,7 @@ cxx-qt-lib.workspace = true
 
 [build-dependencies]
 cxx-qt-build.workspace = true
-cxx-qt-lib-headers.workspace = true
+cxx-qt-lib.workspace = true
 cxx-qt-lib-extras-headers.workspace = true
 
 [features]

diff --git a/crates/cxx-qt-lib-extras/build.rs b/crates/cxx-qt-lib-extras/build.rs
@@ -37,7 +37,7 @@ fn main() {
     println!("cargo:rerun-if-changed=src/assertion_utils.h");
 
     builder
-        .with_opts(cxx_qt_lib_headers::build_opts())
+        .with_dependency(cxx_qt_lib::cxx_qt_build_manifest())
         .with_opts(cxx_qt_lib_extras_headers::build_opts())
         .build();
 }
diff --git a/crates/cxx-qt-lib-headers/Cargo.toml b/crates/cxx-qt-lib-headers/Cargo.toml
diff --git a/crates/cxx-qt-lib-headers/src/lib.rs b/crates/cxx-qt-lib-headers/src/lib.rs
diff --git a/examples/cargo_without_cmake/Cargo.toml b/examples/cargo_without_cmake/Cargo.toml
@@ -31,5 +31,5 @@ cxx-qt-lib.workspace = true
 # Use `cxx-qt-build = "0.6"` 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" ] }
-# Use `cxx-qt-lib-headers = "0.6"` here instead!
+# Use `cxx-qt-lib = "0.6"` here instead!
 cxx-qt-lib.workspace = true
diff --git a/examples/qml_minimal/rust/Cargo.toml b/examples/qml_minimal/rust/Cargo.toml
@@ -38,7 +38,7 @@ cxx-qt-lib.workspace = true
 [build-dependencies]
 # Use `cxx-qt-build = "0.6"` here instead!
 cxx-qt-build.workspace = true
-# Use `cxx-qt-lib-headers = "0.6"` here instead!
+# Use `cxx-qt-lib = "0.6"` here instead!
 cxx-qt-lib.workspace = true
 
 [features]

diff --git a/scripts/release_crates.sh b/scripts/release_crates.sh
@@ -61,14 +61,11 @@ release_crate "cxx-qt"
 # Requires cxx-qt, cxx-qt-gen, and qt-build-utils
 release_crate "cxx-qt-build"
 
-# Requires cxx-qt-build
-release_crate "cxx-qt-lib-headers"
-
-# Requires cxx-qt, cxx-qt-build, cxx-qt-lib-headers
+# Requires cxx-qt, cxx-qt-build
 release_crate "cxx-qt-lib"
 
 # Requires cxx-qt-build
 release_crate "cxx-qt-lib-extras-headers"
 
-# Requires cxx-qt, cxx-qt-build, cxx-qt-lib, cxx-qt-lib-headers, cxx-qt-lib-extras-headers
+# Requires cxx-qt, cxx-qt-build, cxx-qt-lib, cxx-qt-lib-extras-headers
 release_crate "cxx-qt-lib-extras"