From 5203704e247f51e6a6605480e8adcc98677c152e Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Mon, 19 Jun 2023 11:05:58 +0200
Subject: [PATCH] qbs build: Mark some more tools as non-Qt

Plus small clean-ups.

Change-Id: I3601543b04bfc7b016769a63091a91f62607f2dc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/libs/3rdparty/winpty/winpty.qbs     | 3 +--
 src/tools/disclaim/disclaim.qbs         | 1 +
 src/tools/process_stub/process_stub.qbs | 4 ++--
 src/tools/qtpromaker/qtpromaker.qbs     | 4 +---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/libs/3rdparty/winpty/winpty.qbs b/src/libs/3rdparty/winpty/winpty.qbs
index 63d76113646..f6160fe9e62 100644
--- a/src/libs/3rdparty/winpty/winpty.qbs
+++ b/src/libs/3rdparty/winpty/winpty.qbs
@@ -56,8 +56,7 @@ Project {
         Depends { name: "winpty_genversion_header" }
         Depends { name: "cpp" }
 
-        useNonGuiPchFile: false
-        useGuiPchFile: false
+        useQt: false
 
         cpp.includePaths: base.concat([sourceDirectory + "/include", buildDirectory])
         cpp.defines: base.concat(["WINPTY_AGENT_ASSERT",
diff --git a/src/tools/disclaim/disclaim.qbs b/src/tools/disclaim/disclaim.qbs
index 14a5ce7fae6..d379387460b 100644
--- a/src/tools/disclaim/disclaim.qbs
+++ b/src/tools/disclaim/disclaim.qbs
@@ -3,6 +3,7 @@ import qbs 1.0
 QtcTool {
     name: "disclaim"
     condition: qbs.targetOS.contains("macos")
+    useQt: false
 
     files: [
         "disclaim.mm"
diff --git a/src/tools/process_stub/process_stub.qbs b/src/tools/process_stub/process_stub.qbs
index 1fa1bc32a3f..54047ce6759 100644
--- a/src/tools/process_stub/process_stub.qbs
+++ b/src/tools/process_stub/process_stub.qbs
@@ -4,7 +4,7 @@ QtcTool {
     name: "qtcreator_process_stub"
     consoleApplication: true
 
-    Depends { name: "Qt"; submodules: ["core", "network"]; }
+    Depends { name: "Qt.network" }
 
-    files: [ "main.cpp" ]
+    files: "main.cpp"
 }
diff --git a/src/tools/qtpromaker/qtpromaker.qbs b/src/tools/qtpromaker/qtpromaker.qbs
index 50c77f039d3..4e99e21e3f1 100644
--- a/src/tools/qtpromaker/qtpromaker.qbs
+++ b/src/tools/qtpromaker/qtpromaker.qbs
@@ -3,7 +3,5 @@ import qbs 1.0
 QtcTool {
     name: "qtpromaker"
 
-    Depends { name: "Qt.core" }
-
-    files: [ "main.cpp" ]
+    files: "main.cpp"
 }