summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2023-05-17 11:31:49 +0200
committerChristian Stenger <christian.stenger@qt.io>2023-05-17 10:36:29 +0000
commita468bc2f029e50c0516eb712d09562c80ee1bdb1 (patch)
tree5ce4954d8a77f8ebf0ec83d30797e8e52c2aef88
parent3fc461e7129d24184e5850f412892a2426c43293 (diff)
downloadqt-creator-a468bc2f029e50c0516eb712d09562c80ee1bdb1.tar.gz
Fix Qbs build
Amends f84199f8b70bb03b66a0dbac3ff4dcdb56094d20 and reverts 796cfceb3a27337e2f613624a8c223761fdd44b8. Change-Id: I7eb686c012bd99cddf36aa16219e3f33de2b15b2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--src/libs/utils/utils.qbs1
-rw-r--r--tests/auto/solutions/tasking/tasking.qbs1
-rw-r--r--tests/auto/utils/async/async.qbs1
-rw-r--r--tests/manual/tasktree/tasktree.qbs1
4 files changed, 1 insertions, 3 deletions
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index d1c8d0e95e..18dcf1675c 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -471,6 +471,7 @@ Project {
Export {
Depends { name: "Qt"; submodules: ["concurrent", "widgets" ] }
+ Depends { name: "Tasking" }
cpp.includePaths: base.concat("mimetypes2")
}
}
diff --git a/tests/auto/solutions/tasking/tasking.qbs b/tests/auto/solutions/tasking/tasking.qbs
index aa5ab766ef..173c1fc575 100644
--- a/tests/auto/solutions/tasking/tasking.qbs
+++ b/tests/auto/solutions/tasking/tasking.qbs
@@ -1,7 +1,6 @@
QtcAutotest {
name: "Tasking autotest"
- Depends { name: "Tasking" }
Depends { name: "Utils" }
files: "tst_tasking.cpp"
diff --git a/tests/auto/utils/async/async.qbs b/tests/auto/utils/async/async.qbs
index 31fd6268de..696b0959a5 100644
--- a/tests/auto/utils/async/async.qbs
+++ b/tests/auto/utils/async/async.qbs
@@ -2,7 +2,6 @@ import qbs
QtcAutotest {
name: "Async autotest"
- Depends { name: "Tasking" }
Depends { name: "Utils" }
files: "tst_async.cpp"
}
diff --git a/tests/manual/tasktree/tasktree.qbs b/tests/manual/tasktree/tasktree.qbs
index 6a548d4d83..dad8e14763 100644
--- a/tests/manual/tasktree/tasktree.qbs
+++ b/tests/manual/tasktree/tasktree.qbs
@@ -4,7 +4,6 @@ QtcManualtest {
name: "Manual TaskTree test"
type: ["application"]
- Depends { name: "Tasking" }
Depends { name: "Utils" }
files: [