Qbs: Fix linking tests when building release with tests

Change-Id: I5df34f06b5ca107b5e85cf6319d6d08aba244e5b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2020-10-28 08:47:17 +01:00
parent ce413d81d0
commit 050f6b083c
2 changed files with 12 additions and 3 deletions

View File

@@ -9,6 +9,7 @@ Project {
QtcLibrary { QtcLibrary {
Depends { name: "Qt"; submodules: ["qml", "quick", "gui"] } Depends { name: "Qt"; submodules: ["qml", "quick", "gui"] }
Depends { name: "Qt.testlib"; condition: project.withAutotests }
Depends { name: "Utils" } Depends { name: "Utils" }
Group { Group {
@@ -48,7 +49,7 @@ Project {
Group { Group {
name: "Unit test utilities" name: "Unit test utilities"
condition: qtc.testsEnabled condition: project.withAutotests
files: [ files: [
"runscenegraphtest.cpp", "runscenegraphtest.h" "runscenegraphtest.cpp", "runscenegraphtest.h"
] ]

View File

@@ -8,6 +8,7 @@ Project {
QtcPlugin { QtcPlugin {
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "Qt.testlib"; condition: project.withAutotests }
Depends { name: "CPlusPlus" } Depends { name: "CPlusPlus" }
Depends { name: "Utils" } Depends { name: "Utils" }
@@ -216,6 +217,15 @@ Project {
"usages.h", "usages.h",
] ]
Group {
name: "TestCase"
condition: qtc.testsEnabled || project.withAutotests
files: [
"cpptoolstestcase.cpp",
"cpptoolstestcase.h",
]
}
Group { Group {
name: "Tests" name: "Tests"
condition: qtc.testsEnabled condition: qtc.testsEnabled
@@ -230,8 +240,6 @@ Project {
"cppsourceprocessertesthelper.cpp", "cppsourceprocessertesthelper.cpp",
"cppsourceprocessertesthelper.h", "cppsourceprocessertesthelper.h",
"cppsourceprocessor_test.cpp", "cppsourceprocessor_test.cpp",
"cpptoolstestcase.cpp",
"cpptoolstestcase.h",
"modelmanagertesthelper.cpp", "modelmanagertesthelper.cpp",
"modelmanagertesthelper.h", "modelmanagertesthelper.h",
"symbolsearcher_test.cpp", "symbolsearcher_test.cpp",