From dd39d07cd3cbc2b14f657d82f0809fa02d707029 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Tue, 12 Jul 2022 08:15:58 +0200
Subject: [PATCH] SdkTool: Fix qbs release build with auto tests

Change-Id: I42777d24f96186d099a30f9da8ac99b0b1bcba4f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/tools/sdktool/sdktoollib.qbs | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/tools/sdktool/sdktoollib.qbs b/src/tools/sdktool/sdktoollib.qbs
index 180dd14ce2f..4bc7a8777eb 100644
--- a/src/tools/sdktool/sdktoollib.qbs
+++ b/src/tools/sdktool/sdktoollib.qbs
@@ -11,13 +11,18 @@ QtcLibrary {
 
     property string libsDir: path + "/../../libs"
 
-    cpp.defines: base.concat([
-        "UTILS_LIBRARY",
-        qbs.targetOS.contains("macos")
-            ? 'DATA_PATH="."'
-            : qbs.targetOS.contains("windows") ? 'DATA_PATH="../share/qtcreator"'
-                                               : 'DATA_PATH="../../share/qtcreator"'
-    ])
+    cpp.defines: {
+        var defines = base;
+        base.push(
+            "UTILS_LIBRARY",
+            qbs.targetOS.contains("macos")
+                ? 'DATA_PATH="."'
+                : qbs.targetOS.contains("windows") ? 'DATA_PATH="../share/qtcreator"'
+                                                   : 'DATA_PATH="../../share/qtcreator"');
+        if (project.withAutotests)
+            defines.push("WITH_TESTS");
+        return defines;
+    }
     cpp.dynamicLibraries: {
         if (qbs.targetOS.contains("windows"))
             return ["user32", "shell32"]