Merge with master

Author: expenses

Cargo.toml

@@ -146,7 +146,6 @@ clru = { version = "0.6.0" }
 css-color-parser2 = { version = "1.0.1" }
 derive_more = { version = "2.0.0", default-features = false, features = ["deref", "deref_mut", "into", "from", "add", "add_assign", "mul", "not", "display"] }
 euclid = { version = "0.22.1", default-features = false }
-fontdb = { version = "0.23.0", default-features = false }
 fontdue = { version = "0.9.0" }
 glutin = { version = "0.32.0", default-features = false }
 image = { version = "0.25", default-features = false, features = ["png", "jpeg"] }
@@ -172,6 +171,7 @@ glow = { version = "0.16" }
 tikv-jemallocator = { version = "0.6" }
 wgpu-26 = { package = "wgpu", version = "26", default-features = false }
 input = { version = "0.9.0", default-features = false }
+fontique = { version = "0.5.0" }
 
 [profile.release]
 lto = true

internal/common/Cargo.toml

@@ -18,22 +18,11 @@ path = "lib.rs"
 
 [features]
 default = []
-shared-fontdb = ["dep:fontdb", "dep:libloading", "derive_more", "cfg-if", "dep:ttf-parser"]
+shared-fontique = ["dep:fontique", "dep:ttf-parser"]
 
 [dependencies]
-fontdb = { workspace = true, optional = true }
 ttf-parser = { workspace = true, optional = true }
-derive_more = { workspace = true, optional = true }
-cfg-if = { version = "1", optional = true }
-
-[target.'cfg(not(any(target_family = "windows", target_vendor = "apple", target_arch = "wasm32", target_os = "android")))'.dependencies]
-libloading = { version = "0.8.0", optional = true }
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-fontdb = { workspace = true, optional = true, features = ["std", "fs", "fontconfig"] }
-
-[target.'cfg(all(not(target_arch = "wasm32"), not(target_os = "nto")))'.dependencies]
-fontdb = { workspace = true, optional = true, features = ["memmap"] }
+fontique = { workspace = true, optional = true }
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--generate-link-to-definition"]

internal/common/lib.rs

@@ -3,14 +3,14 @@
 
 #![doc = include_str!("README.md")]
 #![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")]
-#![cfg_attr(not(feature = "shared-fontdb"), no_std)]
+#![cfg_attr(not(feature = "shared-fontique"), no_std)]
 
 pub mod builtin_structs;
 pub mod enums;
 pub mod key_codes;
 
-#[cfg(feature = "shared-fontdb")]
-pub mod sharedfontdb;
+#[cfg(feature = "shared-fontique")]
+pub mod sharedfontique;
 
 /// Detect the native style depending on the platform
 pub fn get_native_style(has_qt: bool, target: &str) -> &'static str {