From 4ca7dd87634dd1aa7046e9a64d640c2f7dfb2b9e Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Thu, 27 Jul 2023 14:28:04 +0200
Subject: [PATCH] Terminal: Adapt to recent restructuring

Amends 42ed82973cec46f74f9ac57ac9ee79cd50d74c9f.

Change-Id: I5845d1fe15ee88862742ee81486ba57062ab0158
Reviewed-by: hjk <hjk@qt.io>
---
 src/libs/solutions/solutions.qbs         |  1 +
 src/libs/solutions/terminal/terminal.qbs | 25 ++++++++++++++++++++++++
 src/plugins/terminal/terminal.qbs        | 13 +-----------
 3 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 src/libs/solutions/terminal/terminal.qbs

diff --git a/src/libs/solutions/solutions.qbs b/src/libs/solutions/solutions.qbs
index 3978235666e..d166c43f439 100644
--- a/src/libs/solutions/solutions.qbs
+++ b/src/libs/solutions/solutions.qbs
@@ -4,5 +4,6 @@ Project {
     references: [
         "spinner/spinner.qbs",
         "tasking/tasking.qbs",
+        "terminal/terminal.qbs",
     ].concat(project.additionalLibs)
 }
diff --git a/src/libs/solutions/terminal/terminal.qbs b/src/libs/solutions/terminal/terminal.qbs
new file mode 100644
index 00000000000..a8b10b10cbb
--- /dev/null
+++ b/src/libs/solutions/terminal/terminal.qbs
@@ -0,0 +1,25 @@
+import qbs 1.0
+
+QtcLibrary {
+    name: "TerminalLib"
+
+    Depends { name: "vterm" }
+    Depends { name: "Qt"; submodules: "widgets" }
+
+    files: [
+        "celliterator.cpp",
+        "celliterator.h",
+        "glyphcache.cpp",
+        "glyphcache.h",
+        "keys.cpp",
+        "keys.h",
+        "scrollback.cpp",
+        "scrollback.h",
+        "surfaceintegration.h",
+        "terminal_global.h",
+        "terminalsurface.cpp",
+        "terminalsurface.h",
+        "terminalview.cpp",
+        "terminalview.h",
+    ]
+}
diff --git a/src/plugins/terminal/terminal.qbs b/src/plugins/terminal/terminal.qbs
index f9b3409bebd..57ce8042b6e 100644
--- a/src/plugins/terminal/terminal.qbs
+++ b/src/plugins/terminal/terminal.qbs
@@ -5,18 +5,9 @@ QtcPlugin {
 
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
-    Depends { name: "vterm" }
-    Depends { name: "ptyqt" }
+    Depends { name: "TerminalLib" }
 
     files: [
-        "celliterator.cpp",
-        "celliterator.h",
-        "glyphcache.cpp",
-        "glyphcache.h",
-        "keys.cpp",
-        "keys.h",
-        "scrollback.cpp",
-        "scrollback.h",
         "shellmodel.cpp",
         "shellmodel.h",
         "shellintegration.cpp",
@@ -35,8 +26,6 @@ QtcPlugin {
         "terminalsearch.h",
         "terminalsettings.cpp",
         "terminalsettings.h",
-        "terminalsurface.cpp",
-        "terminalsurface.h",
         "terminaltr.h",
         "terminalwidget.cpp",
         "terminalwidget.h",