Terminal: Adapt to recent restructuring

Amends 42ed82973c.

Change-Id: I5845d1fe15ee88862742ee81486ba57062ab0158
Reviewed-by: hjk <hjk@qt.io>

src/libs/solutions/solutions.qbs

@@ -4,5 +4,6 @@ Project {
     references: [
         "spinner/spinner.qbs",
         "tasking/tasking.qbs",
+        "terminal/terminal.qbs",
     ].concat(project.additionalLibs)
 }

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",
+    ]
+}

src/plugins/terminal/terminal.qbs

@@ -5,18 +5,9 @@ QtcPlugin {
 
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
-    Depends { name: "vterm" }
+    Depends { name: "TerminalLib" }
-    Depends { name: "ptyqt" }
 
     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",