From d56e627427b9707caa64e10d1214b0adacbc970b Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Mon, 7 Oct 2019 15:58:44 +0200
Subject: [PATCH] pro2cmake: Don't add default Qt libraries to bootstrapped
 tools

Change-Id: I3ccc20ed5fcd2eaceb5af09df4a8bf7ccb2d525f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
---
 util/cmake/pro2cmake.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index fec4eed19d..64ca5d78d4 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -2765,7 +2765,13 @@ def write_module(cm_fh: IO[str], scope: Scope, *, indent: int = 0) -> str:
 def write_tool(cm_fh: IO[str], scope: Scope, *, indent: int = 0) -> str:
     tool_name = scope.TARGET
 
-    extra = ["BOOTSTRAP"] if "force_bootstrap" in scope.get("CONFIG") else []
+    if "force_bootstrap" in scope.get("CONFIG"):
+        extra = ["BOOTSTRAP"]
+
+        # Remove default QT libs.
+        scope._append_operation("QT", RemoveOperation(["core", "gui"]))
+    else:
+        extra = []
 
     write_main_part(
         cm_fh,