diff --git a/TODO.org b/TODO.org index 83c5a11..42a4c11 100644 --- a/TODO.org +++ b/TODO.org @@ -4,10 +4,13 @@ :CATEGORY: dev :END: -* Tasks [63%] [55/87] +* Tasks [62%] [55/88] ** TODO [#A] REWRITE FOR ALL RUST AND BUILD WITH CARGO -** TODO [#A] Plugin architecture with steel or some scheme as an extension language -** TODO [#A] Server client architecture +Found that making sure qmake comes from qt6.full in the flake helps a lot! +** TODO [#A] Move slides into service_items +I believe this will enable me to build things with much more simplicity. The service items contain slides anyway. +** TODO [#C] Plugin architecture with steel or some scheme as an extension language +** TODO [#C] Server client architecture ** TODO [#A] Organize and layout structure of rust code :maintenance: Since building a lot of the rust code felt more like an experiment, I've not kept it very well organized. I need to go through each model and rust module and organize them well and then decide what needs to be publicly available or not. diff --git a/flake.nix b/flake.nix index 66e73f3..de29559 100644 --- a/flake.nix +++ b/flake.nix @@ -33,6 +33,7 @@ ]) rust-analyzer qt6.wrapQtAppsHook + sccache ]; bi = with pkgs; [ @@ -117,6 +118,7 @@ makeQtWrapper "/bin/sh" "$setQtEnvironment" "''${qtWrapperArgs[@]}" sed "/^exec/d" -i "$setQtEnvironment" source "$setQtEnvironment" + export QMAKE=${pkgs.qt6.full}/bin/qmake ''; # shellHook = '' # export CMAKE_PREFIX_PATH="${pkgs.qt6.full}/lib/cmake/Qt6:$CMAKE_PREFIX_PATH" diff --git a/smdview/blah/build.rs b/smdview/blah/build.rs index 73fb35e..90ac9ee 100644 --- a/smdview/blah/build.rs +++ b/smdview/blah/build.rs @@ -5,7 +5,7 @@ fn main() { .qt_module("Network") .qml_module(QmlModule { uri: "org.kde.simplemdviewer", - qml_files: &["src/qml/Main.qml"], + qml_files: &["src/qml/main.qml"], rust_files: &["src/main.rs"], ..Default::default() }) diff --git a/smdview/blah/src/main.rs b/smdview/blah/src/main.rs index c79e764..00cd75b 100644 --- a/smdview/blah/src/main.rs +++ b/smdview/blah/src/main.rs @@ -1,7 +1,8 @@ #[cxx_qt::bridge] mod ffi { - extern "RustQt" { + unsafe extern "RustQt" { #[qobject] + #[qml_element] type DummyQObject = super::DummyRustStruct; } } @@ -32,7 +33,7 @@ fn main() { let mut engine = QQmlApplicationEngine::new(); if let Some(engine) = engine.as_mut() { engine.load(&QUrl::from( - "qrc:/qt/qml/org/kde/simplemdviewer/src/qml/Main.qml", + "qrc:/qt/qml/org/kde/simplemdviewer/src/qml/main.qml", )); }