Error crash fix

CMakeLists.txt

@@ -46,6 +46,12 @@ endif()
 # Enable QML Language Server support for IDE/VS Code
 set(QT_QML_GENERATE_QMLLS_INI ON)
 
+set(QML_IMPORT_PATH
+    "${CMAKE_BINARY_DIR}"
+    "${CMAKE_BINARY_DIR}/shell/qml"
+    CACHE STRING "" FORCE
+)
+
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

apps/CMakeLists.txt

@@ -50,6 +50,19 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/QMLLint.cmake")
   include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/QMLLint.cmake)
 endif()
 
+get_filename_component(REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/.." ABSOLUTE)
+set(QML_IMPORT_PATH
+  "${REPO_ROOT}/build/qmllint"
+  "${REPO_ROOT}/build"
+  "${REPO_ROOT}/build/shell/qml"
+  CACHE STRING "" FORCE
+)
+set(MARATHON_QML_IMPORT_PATH
+  "${REPO_ROOT}/build/qmllint"
+  "${REPO_ROOT}/build"
+  "${REPO_ROOT}/build/shell/qml"
+)
+
 
 function(add_marathon_app APP_NAME)
   set(options "")
@@ -119,6 +132,10 @@ function(add_marathon_app APP_NAME)
     "${MODULE_OUTPUT_DIR}"
     NO_PLUGIN_OPTIONAL)
 
+  set_property(TARGET ${APP_NAME} APPEND PROPERTY QT_QML_IMPORT_PATH
+    "${MARATHON_QML_IMPORT_PATH}"
+  )
+
   if(APPLE)
     install(
       CODE "

apps/browser/components/BrowserDrawer.qml

@@ -1,21 +1,13 @@
-import QtQuick
 import MarathonApp.Browser
-import QtQuick.Layouts
 import MarathonOS.Shell
-import MarathonUI.Theme
 import MarathonUI.Core
 import MarathonUI.Navigation
+import MarathonUI.Theme
+import QtQuick
+import QtQuick.Layouts
 
 Rectangle {
     id: drawer
-    anchors.fill: parent
-    color: MColors.background
-
-    signal closed
-    signal tabSelected(int tabId)
-    signal newTabRequested
-    signal bookmarkSelected(string url)
-    signal historySelected(string url)
 
     property int selectedTabIndex: 0
     property alias contentStack: contentStack
@@ -24,33 +16,42 @@ Rectangle {
     property alias historyPage: historyPage
     property alias settingsPage: settingsPage
 
+    signal closed
+    signal tabSelected(int tabId)
+    signal newTabRequested
+    signal bookmarkSelected(string url)
+    signal historySelected(string url)
+
+    anchors.fill: parent
+    color: MColors.background
+
     Column {
         anchors.fill: parent
         spacing: 0
 
         MTabBar {
             id: drawerTabs
+
             width: parent.width
             activeTab: drawer.selectedTabIndex
             tabs: [
                 {
-                    label: "Tabs",
-                    icon: "layers"
+                    "label": "Tabs",
+                    "icon": "layers"
                 },
                 {
-                    label: "Bookmarks",
-                    icon: "star"
+                    "label": "Bookmarks",
+                    "icon": "star"
                 },
                 {
-                    label: "History",
-                    icon: "clock"
+                    "label": "History",
+                    "icon": "clock"
                 },
                 {
-                    label: "Settings",
-                    icon: "settings"
+                    "label": "Settings",
+                    "icon": "settings"
                 }
             ]
-
             onTabSelected: index => {
                 drawer.selectedTabIndex = index;
                 Logger.info("BrowserDrawer", "Switched to tab: " + index);
@@ -59,18 +60,23 @@ Rectangle {
 
         StackLayout {
             id: contentStack
+
             width: parent.width
             height: parent.height - drawerTabs.height
             currentIndex: drawer.selectedTabIndex
 
             TabsPage {
                 id: tabsPage
-                onTabSelected: tabId => drawer.tabSelected(tabId)
+
+                onTabSelected: tabId => {
+                    return drawer.tabSelected(tabId);
+                }
                 onNewTabRequested: drawer.newTabRequested()
             }
 
             BookmarksPage {
                 id: bookmarksPage
+
                 onBookmarkSelected: url => {
                     drawer.bookmarkSelected(url);
                     drawer.closed();
@@ -79,6 +85,7 @@ Rectangle {
 
             HistoryPage {
                 id: historyPage
+
                 onHistorySelected: url => {
                     drawer.historySelected(url);
                     drawer.closed();

apps/browser/components/TabCard.qml

@@ -1,32 +1,30 @@
-import QtQuick
 import MarathonApp.Browser
 import MarathonOS.Shell
-import MarathonUI.Theme
-import MarathonUI.Core
 import MarathonUI.Containers
+import MarathonUI.Core
+import MarathonUI.Theme
+import QtQuick
 
 MCard {
     id: tabCard
-    height: Constants.cardHeight
-    elevation: isCurrentTab ? 2 : 1
-    interactive: false // Disable built-in MouseArea to allow custom z-ordering
-
-    signal tabClicked
-    signal closeRequested
 
     property var tabData: null
     property bool isCurrentTab: false
 
-    border.color: isCurrentTab ? MColors.accentBright : MColors.border
+    signal tabClicked
+    signal closeRequested
 
+    height: Constants.cardHeight
+    elevation: isCurrentTab ? 2 : 1
+    interactive: false
+    border.color: isCurrentTab ? MColors.accentBright : MColors.border
     onClicked: {
         tabCard.tabClicked();
     }
 
-    // Manual MouseArea for tab clicking, placed behind content but filling card
     MouseArea {
         anchors.fill: parent
-        z: 0 // Bottom layer
+        z: 0
         onClicked: {
             tabCard.tabClicked();
         }
@@ -35,7 +33,7 @@ MCard {
     Column {
         anchors.fill: parent
         anchors.margins: MSpacing.md
-        anchors.rightMargin: MSpacing.md + Constants.touchTargetSmall // Make room for close button
+        anchors.rightMargin: MSpacing.md + Constants.touchTargetSmall
         spacing: MSpacing.sm
 
         Item {
@@ -44,6 +42,7 @@ MCard {
 
             Icon {
                 id: globeIcon
+
                 anchors.left: parent.left
                 anchors.top: parent.top
                 name: "globe"
@@ -100,29 +99,27 @@ MCard {
 
     Item {
         id: closeButtonContainer
+
         anchors.right: parent.right
         anchors.top: parent.top
         width: Constants.touchTargetSmall
         height: Constants.touchTargetSmall
-        z: 1000 // High z-index to sit above card content
+        z: 1000
 
         MIconButton {
             anchors.centerIn: parent
             iconName: "x"
-            // Disable internal mouse handling to prevent conflicts, we handle it manually
             enabled: false
-            opacity: closeMouseArea.pressed ? 0.7 : 1.0 // Visual feedback
-            // color property removed as it caused a crash
+            opacity: closeMouseArea.pressed ? 0.7 : 1
         }
 
         MouseArea {
             id: closeMouseArea
+
             anchors.fill: parent
             hoverEnabled: true
             preventStealing: true
             propagateComposedEvents: false
-
-            // Explicitly accept all events to prevent propagation to MCard
             onPressed: mouse => {
                 mouse.accepted = true;
             }
@@ -135,7 +132,6 @@ MCard {
             onPressAndHold: mouse => {
                 mouse.accepted = true;
             }
-
             onClicked: mouse => {
                 mouse.accepted = true;
                 tabCard.closeRequested();

apps/browser/components/WebView.qml

@@ -1,25 +1,19 @@
-import QtQuick
 import MarathonApp.Browser
-import QtWebEngine
 import MarathonOS.Shell
 import MarathonUI.Core
+import QtQuick
+import QtWebEngine
 
-// Separate file for WebEngineView to enable true lazy loading
-// This file is only loaded when needed, avoiding QtWebEngine initialization on app launch
 WebEngineView {
     id: webView
 
     property bool updatingTabUrl: false
     property bool active: true
     property bool crashed: false
-    // Allows BrowserApp to discard WebEngine state while minimized without breaking bindings.
     property bool forceDiscarded: false
 
-    zoomFactor: 1.0
-
-    // Keep per-tab state, but freeze background tabs (no reload) on low-end devices.
+    zoomFactor: 1
     lifecycleState: forceDiscarded ? WebEngineView.LifecycleState.Discarded : (active ? WebEngineView.LifecycleState.Active : WebEngineView.LifecycleState.Frozen)
-
     settings.accelerated2dCanvasEnabled: false
     settings.webGLEnabled: false
     settings.pluginsEnabled: false