From b7d659f32f5a0f988b4d1aabde024ca7eacd7693 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 30 Sep 2024 15:14:57 +0200 Subject: [PATCH] qbs build: Remove deprecated test properties Also introduce a new convenience property that enables both autotests and plugin tests. Change-Id: Ifb30f19aae58b08a2a32f3a7df0260b05a8002e7 Reviewed-by: Christian Stenger --- qbs/modules/qtc/qtc.qbs | 6 +++--- qtcreator.qbs | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 3a14ac82e1e..6b323c3037a 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -72,9 +72,9 @@ Module { property bool preferSystemSyntaxHighlighting: true - property bool withPluginTests: Environment.getEnv("TEST") || qbs.buildVariant === "debug" - property bool testsEnabled: withPluginTests // TODO: compat, remove - property bool withAutotests: project.withAutotests // FIXME: withPluginTests + property bool withAllTests: Environment.getEnv("TEST") || qbs.buildVariant === "debug" + property bool withPluginTests: withAllTests + property bool withAutotests: withAllTests property stringList generalDefines: [ "QT_CREATOR", diff --git a/qtcreator.qbs b/qtcreator.qbs index 21f610de563..052350b77e0 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -1,7 +1,6 @@ Project { name: "Qt Creator" minimumQbsVersion: "2.0.0" - property bool withAutotests: qbs.buildVariant === "debug" // TODO: compat, remove property path ide_source_tree: path property pathList additionalPlugins: [] property pathList additionalLibs: []