[stable-34.0] refactor(gui/search): build as a proper QML module

CMakeLists.txt

@@ -93,6 +93,7 @@ include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(ECMMarkNonGuiExecutable)
 include(ECMSetupVersion)
+include(ECMQmlModule)
 
 #include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMEnableSanitizers)

resources.qrc

@@ -6,7 +6,6 @@
         <file>src/gui/WindowAccountHeader.qml</file>
         <file>src/gui/ActivitiesWindow.qml</file>
         <file>src/gui/AssistantWindow.qml</file>
-        <file>src/gui/search/qml/SearchWindow.qml</file>
         <file>src/gui/UserStatusWindowStatusRow.qml</file>
         <file>src/gui/UserStatusWindowPredefinedStatusRow.qml</file>
         <file>src/gui/UserStatusSelectorPage.qml</file>
@@ -38,16 +37,6 @@
         <file>src/gui/tray/ActivityList.qml</file>
         <file>src/gui/tray/CurrentAccountHeaderButton.qml</file>
         <file>src/gui/tray/TrayWindowHeader.qml</file>
-        <file>src/gui/search/qml/UnifiedSearchInputContainer.qml</file>
-        <file>src/gui/search/qml/UnifiedSearchResultFetchMoreTrigger.qml</file>
-        <file>src/gui/search/qml/UnifiedSearchResultItem.qml</file>
-        <file>src/gui/search/qml/UnifiedSearchResultItemSkeleton.qml</file>
-        <file>src/gui/search/qml/UnifiedSearchResultItemSkeletonContainer.qml</file>
-        <file>src/gui/search/qml/UnifiedSearchResultItemSkeletonGradientRectangle.qml</file>
-        <file>src/gui/search/qml/UnifiedSearchResultListItem.qml</file>
-        <file>src/gui/search/qml/UnifiedSearchResultNothingFound.qml</file>
-        <file>src/gui/search/qml/UnifiedSearchPlaceholderView.qml</file>
-        <file>src/gui/search/qml/UnifiedSearchResultSectionItem.qml</file>
         <file>src/gui/tray/ActivityItemContextMenu.qml</file>
         <file>src/gui/tray/ActivityItemActions.qml</file>
         <file>src/gui/tray/ActivityItemContent.qml</file>

src/gui/CMakeLists.txt

@@ -237,14 +237,10 @@ set(client_SRCS
     tray/activitydata.cpp
     tray/activitylistmodel.h
     tray/activitylistmodel.cpp
-    search/unifiedsearchresult.h
     tray/asyncimageresponse.cpp
-    search/unifiedsearchresult.cpp
-    search/unifiedsearchresultslistmodel.h
     tray/trayimageprovider.cpp
     tray/trayaccountappsmodel.h
     tray/trayaccountappsmodel.cpp
-    search/unifiedsearchresultslistmodel.cpp
     tray/usermodel.h
     tray/usermodel.cpp
     tray/notificationhandler.h
@@ -292,6 +288,8 @@ IF(BUILD_UPDATER)
     )
 endif()
 
+add_subdirectory(search)
+
 IF( APPLE )
     list(APPEND client_SRCS cocoainitializer_mac.mm)
     list(APPEND client_SRCS systray_mac_common.mm)
@@ -579,6 +577,9 @@ target_link_libraries(nextcloudCore
   Qt::QuickWidgets
   KF6::Archive
   KDAB::kdsingleapplication
+
+  nextcloudGuiSearch
+  nextcloudGuiSearchplugin
   )
 
 if(KF6GuiAddons_FOUND)

src/gui/search/CMakeLists.txt

@@ -0,0 +1,31 @@
+# SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+add_library(nextcloudGuiSearch STATIC)
+
+target_sources(nextcloudGuiSearch
+  PRIVATE
+    unifiedsearchresult.h
+    unifiedsearchresult.cpp
+    unifiedsearchresultslistmodel.h
+    unifiedsearchresultslistmodel.cpp
+)
+
+ecm_add_qml_module(nextcloudGuiSearch
+  URI com.nextcloud.desktopclient.search
+  GENERATE_PLUGIN_SOURCE
+  QML_FILES
+    SearchWindow.qml
+    UnifiedSearchInputContainer.qml
+    UnifiedSearchResultFetchMoreTrigger.qml
+    UnifiedSearchResultItem.qml
+    UnifiedSearchResultItemSkeleton.qml
+    UnifiedSearchResultItemSkeletonContainer.qml
+    UnifiedSearchResultItemSkeletonGradientRectangle.qml
+    UnifiedSearchResultListItem.qml
+    UnifiedSearchResultNothingFound.qml
+    UnifiedSearchPlaceholderView.qml
+    UnifiedSearchResultSectionItem.qml
+)
+
+target_link_libraries(nextcloudGuiSearch PRIVATE nextcloudCore)

src/gui/search/qml/SearchWindow.qml → src/gui/search/SearchWindow.qml

@@ -9,7 +9,7 @@ import QtQuick.Layouts
 
 import Style
 import com.nextcloud.desktopclient
-import "../.."
+import "qrc:/qml/src/gui"
 
 WizardStyledWindow {
     id: root

src/gui/search/qml/UnifiedSearchInputContainer.qml → src/gui/search/UnifiedSearchInputContainer.qml

@@ -10,7 +10,7 @@ import Qt5Compat.GraphicalEffects
 import Style
 
 import com.nextcloud.desktopclient
-import "../../tray"
+import "qrc:/qml/src/gui/tray"
 
 TextField {
     id: root

src/gui/search/qml/UnifiedSearchPlaceholderView.qml → src/gui/search/UnifiedSearchPlaceholderView.qml

@@ -8,7 +8,7 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import Style
-import "../../tray"
+import "qrc:/qml/src/gui/tray"
 
 ColumnLayout {
     id: root

src/gui/search/qml/UnifiedSearchResultFetchMoreTrigger.qml → src/gui/search/UnifiedSearchResultFetchMoreTrigger.qml

@@ -8,7 +8,7 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import Style
-import "../../tray"
+import "qrc:/qml/src/gui/tray"
 
 ColumnLayout {
     id: unifiedSearchResultItemFetchMore

src/gui/search/qml/UnifiedSearchResultItem.qml → src/gui/search/UnifiedSearchResultItem.qml

@@ -10,7 +10,7 @@ import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
 
 import Style
-import "../../tray"
+import "qrc:/qml/src/gui/tray"
 
 RowLayout {
     id: unifiedSearchResultItemDetails

src/gui/search/qml/UnifiedSearchResultNothingFound.qml → src/gui/search/UnifiedSearchResultNothingFound.qml

@@ -8,7 +8,7 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import Style
-import "../../tray"
+import "qrc:/qml/src/gui/tray"
 
 ColumnLayout {
     id: unifiedSearchResultNothingFoundContainer

src/gui/search/qml/UnifiedSearchResultSectionItem.qml → src/gui/search/UnifiedSearchResultSectionItem.qml

@@ -9,7 +9,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Style
 import com.nextcloud.desktopclient
-import "../../tray"
+import "qrc:/qml/src/gui/tray"
 
 EnforcedPlainTextLabel {
     required property string section

src/gui/systray.cpp

@@ -46,6 +46,8 @@
 #define NOTIFICATIONS_IFACE "org.freedesktop.Notifications"
 #endif
 
+using namespace Qt::StringLiterals;
+
 namespace OCC {
 
 Q_LOGGING_CATEGORY(lcSystray, "nextcloud.gui.systray")
@@ -428,7 +430,7 @@
         return;
     }
 
-    QQmlComponent searchWindowComponent(trayEngine(), QStringLiteral("qrc:/qml/src/gui/search/qml/SearchWindow.qml"));
+    QQmlComponent searchWindowComponent(trayEngine(), "com.nextcloud.desktopclient.search"_L1, "SearchWindow"_L1);
 
     if (searchWindowComponent.isError()) {
         qCWarning(lcSystray) << searchWindowComponent.errorString();