feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qbs: Fix linking tests when building release with tests

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/tracing/tracing.qbs
View File

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

12
src/plugins/cpptools/cpptools.qbs
View File

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