From c60f999a6635f444990393ea8954c295525f6e86 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Fri, 28 Jul 2023 06:39:22 +0200
Subject: [PATCH] Fix qbs build

Amends 4ca7dd87634dd1aa7046e9a64d640c2f7dfb2b9e
and 80b23292b1b5448e237703ecbcc92cfdb84f7a1d.

Change-Id: I323a22b1427d51a1c25a41b2ab54eef8bc68a32f
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
---
 src/libs/solutions/terminal/terminal.qbs |  4 ++++
 src/plugins/coreplugin/coreplugin.qbs    | 10 ++++++++++
 src/plugins/terminal/terminal.qbs        |  2 --
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/libs/solutions/terminal/terminal.qbs b/src/libs/solutions/terminal/terminal.qbs
index a8b10b10cbb..56d317148b1 100644
--- a/src/libs/solutions/terminal/terminal.qbs
+++ b/src/libs/solutions/terminal/terminal.qbs
@@ -6,6 +6,10 @@ QtcLibrary {
     Depends { name: "vterm" }
     Depends { name: "Qt"; submodules: "widgets" }
 
+    cpp.defines: base.concat([
+        "TERMINALLIB_LIBRARY"
+    ])
+
     files: [
         "celliterator.cpp",
         "celliterator.h",
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index 1cd3fcb7b31..63fbe1520b9 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -18,6 +18,7 @@ Project {
 
         Depends { name: "Utils" }
         Depends { name: "Aggregation" }
+        Depends { name: "TerminalLib" }
 
         cpp.dynamicLibraries: {
             if (qbs.targetOS.contains("windows"))
@@ -367,6 +368,15 @@ Project {
             ]
         }
 
+        Group {
+            name: "Terminal"
+            prefix: "terminal/"
+            files: [
+                "searchableterminal.cpp",
+                "searchableterminal.h",
+            ]
+        }
+
         Export {
             Depends { name: "Aggregation" }
             Depends { name: "Utils" }
diff --git a/src/plugins/terminal/terminal.qbs b/src/plugins/terminal/terminal.qbs
index 57ce8042b6e..4cf3bb7a1b7 100644
--- a/src/plugins/terminal/terminal.qbs
+++ b/src/plugins/terminal/terminal.qbs
@@ -22,8 +22,6 @@ QtcPlugin {
         "terminalplugin.cpp",
         "terminalprocessimpl.cpp",
         "terminalprocessimpl.h",
-        "terminalsearch.cpp",
-        "terminalsearch.h",
         "terminalsettings.cpp",
         "terminalsettings.h",
         "terminaltr.h",