test
This commit is contained in:
parent
fb1165155e
commit
b4edc8ad50
3 changed files with 9 additions and 8 deletions
10
Cargo.toml
10
Cargo.toml
|
@ -7,14 +7,14 @@ edition = "2021"
|
||||||
crate-type = ["staticlib"]
|
crate-type = ["staticlib"]
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
cxx-qt-build = { git = "https://github.com/redstrate/cxx-qt", branch = "work/josh/add-qdatetime-from-string"}
|
cxx-qt-build = { version = "0.7.0" }
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
cxx = "1.0.121"
|
cxx = "1.0.121"
|
||||||
cxx-qt = { git = "https://github.com/redstrate/cxx-qt", branch = "work/josh/add-qdatetime-from-string" }
|
cxx-qt = { version = "0.7.0" }
|
||||||
cxx-qt-lib = { git = "https://github.com/redstrate/cxx-qt", branch = "work/josh/add-qdatetime-from-string", features = ["qt_qml", "serde", "qt_gui", "qt_quickcontrols"] }
|
cxx-qt-lib = { version = "0.7.0", features = ["qt_qml", "serde", "qt_gui", "qt_quickcontrols"] }
|
||||||
cxx-kde-frameworks = { path = "/home/josh/sources/cxx-kde-frameworks" }
|
cxx-kde-frameworks = { git = "https://invent.kde.org/libraries/cxx-kde-frameworks" }
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
tokio = "1.41.1"
|
tokio = "1.41.1"
|
||||||
reqwest = "0.12.9"
|
reqwest = "0.12.9"
|
||||||
|
|
|
@ -56,7 +56,7 @@ fn main() {
|
||||||
.as_mut()
|
.as_mut()
|
||||||
.load(&QUrl::from("qrc:/qt/qml/com/redstrate/sukai/ui/Main.qml"));
|
.load(&QUrl::from("qrc:/qt/qml/com/redstrate/sukai/ui/Main.qml"));
|
||||||
|
|
||||||
unsafe {
|
/*unsafe {
|
||||||
let account_manager = engine
|
let account_manager = engine
|
||||||
.singleton_instance::<AccountManager>(
|
.singleton_instance::<AccountManager>(
|
||||||
QAnyStringView::from("com.redstrate.sukai"),
|
QAnyStringView::from("com.redstrate.sukai"),
|
||||||
|
@ -65,7 +65,7 @@ fn main() {
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let mut pin: Pin<&mut AccountManager> = Pin::new_unchecked(account_manager);
|
let mut pin: Pin<&mut AccountManager> = Pin::new_unchecked(account_manager);
|
||||||
pin.as_mut().load_from_settings();
|
pin.as_mut().load_from_settings();
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(app) = app.as_mut() {
|
if let Some(app) = app.as_mut() {
|
||||||
|
|
|
@ -28,7 +28,8 @@ where
|
||||||
D: Deserializer<'de>,
|
D: Deserializer<'de>,
|
||||||
{
|
{
|
||||||
let s = QString::deserialize(deserializer)?;
|
let s = QString::deserialize(deserializer)?;
|
||||||
Ok(QDateTime::from_string(&s, DateFormat::ISODate).unwrap())
|
//Ok(QDateTime::from_string(&s, DateFormat::ISODate).unwrap())
|
||||||
|
Ok(QDateTime::default())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn parse_datetime_optional<'de, D>(deserializer: D) -> Result<Option<QDateTime>, D::Error>
|
pub fn parse_datetime_optional<'de, D>(deserializer: D) -> Result<Option<QDateTime>, D::Error>
|
||||||
|
|
Reference in a new issue