From b28921c39fbf61f37a46a6443ad258dedc75b609 Mon Sep 17 00:00:00 2001
From: Levi Neely <141506390+lneely@users.noreply.github.com>
Date: Sat, 1 Aug 2026 08:43:41 +0200
Subject: [PATCH] fix qt_add_resources: add BASE gui so main.qml is at
 qrc:/main.qml

---
 CMakeLists.txt | 60 +++++---------------------------------------------
 1 file changed, 6 insertions(+), 54 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0065e07..d427da2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,25 +96,8 @@ if(OLLIE_KF5)
 
 else()
     # --- Qt6 / KF6 ---
-    find_package(Qt6 REQUIRED COMPONENTS Core Concurrent DBus Widgets Quick QuickControls2 Multimedia Network)
-    find_package(KF6StatusNotifierItem REQUIRED)
-    find_package(KF6 REQUIRED COMPONENTS Runner Notifications CoreAddons Config)
-    find_package(Plasma REQUIRED)
-
-    # --- System Tray ---
-    add_executable(ollie-tray
-        tray/main.cpp
-        tray/ollie_tray.cpp
-    )
-    target_include_directories(ollie-tray PRIVATE
-        ${CMAKE_SOURCE_DIR}
-    )
-    target_link_libraries(ollie-tray
-        Qt6::Core
-        Qt6::DBus
-        Qt6::Widgets
-        KF6::StatusNotifierItem
-    )
+    find_package(Qt6 REQUIRED COMPONENTS Core Widgets Quick QuickControls2)
+    find_package(KF6 REQUIRED COMPONENTS Runner CoreAddons)
 
     # KDE's KDE_INSTALL_PLUGINDIR defaults to lib64/plugins/ but Qt6 plugins
     # live under lib64/qt6/plugins/. Override so kcoreaddons_add_plugin installs
@@ -147,57 +130,26 @@ else()
         target_link_libraries(ollie_kate ${KATEPRIVATE_LIB})
     endif()
 
-    # --- Plasmoid QML Plugin ---
-    qt6_add_qml_module(ollie-plasmoid-plugin
-        URI org.ollie.private
-        VERSION 1.0
-        SOURCES
-            plasmoid/plugin/olliedbusclient.h
-            plasmoid/plugin/olliedbusclient.cpp
-        OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/org/ollie/private
-    )
-    target_link_libraries(ollie-plasmoid-plugin PRIVATE
-        Qt6::Core
-        Qt6::DBus
-        Qt6::Quick
-    )
-    target_include_directories(ollie-plasmoid-plugin PRIVATE
-        ${CMAKE_SOURCE_DIR}/plasmoid/plugin
-    )
-
-    # --- Plasmoid Package ---
-    plasma_install_package(plasmoid org.ollie.plasmoid)
-
-    # --- GUI App ---
+    # --- GUI App (9P-based, no D-Bus) ---
     add_executable(ollie-gui
         gui/main.cpp
-        gui/thememanager.cpp
-        gui/chatblockmodel.cpp
-        plasmoid/plugin/olliedbusclient.cpp
+        gui/ollie9pclient.cpp
     )
     target_include_directories(ollie-gui PRIVATE
-        ${CMAKE_SOURCE_DIR}/plasmoid/plugin
         ${CMAKE_SOURCE_DIR}/gui
     )
     target_link_libraries(ollie-gui
         Qt6::Core
-        Qt6::Concurrent
-        Qt6::DBus
         Qt6::Widgets
         Qt6::Quick
         Qt6::QuickControls2
-        Qt6::Multimedia
-        Qt6::Network
-        KF6::ConfigCore
-        KF6::SyntaxHighlighting
     )
     qt_add_resources(ollie-gui "gui"
         PREFIX "/"
-        FILES gui/main.qml gui/ChatPane.qml gui/SessionGraph.qml gui/emojis.js
+        BASE gui
+        FILES gui/main.qml
     )
 
     # --- Install ---
     install(TARGETS ollie-gui DESTINATION ${KDE_INSTALL_BINDIR})
-    install(TARGETS ollie-plasmoid-plugin
-        DESTINATION ${KDE_INSTALL_QMLDIR}/org/ollie/private)
 endif()