summaryrefslogtreecommitdiff
path: root/qbs-resources
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2020-08-20 19:04:56 +0200
committerIvan Komissarov <ABBAPOH@gmail.com>2020-08-21 08:31:51 +0000
commit34a35f6a499250443108b2f634d7720112056438 (patch)
tree0044a33e8ce1b5e6ea14537aedf7750b22c822cc /qbs-resources
parentcb4875d06b989c6af59c5989daf224c61e49b10b (diff)
downloadqbs-34a35f6a499250443108b2f634d7720112056438.tar.gz
qbsbuild: inherit QbsAutotest from QbsProduct
To reduce copy&paste Change-Id: I3c21b5c793217950c3527899b6382d86494ee12f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'qbs-resources')
-rw-r--r--qbs-resources/imports/QbsAutotest.qbs6
1 files changed, 2 insertions, 4 deletions
diff --git a/qbs-resources/imports/QbsAutotest.qbs b/qbs-resources/imports/QbsAutotest.qbs
index c26d9660e..0bf118bc9 100644
--- a/qbs-resources/imports/QbsAutotest.qbs
+++ b/qbs-resources/imports/QbsAutotest.qbs
@@ -2,7 +2,7 @@ import qbs
import qbs.FileInfo
import qbs.Utilities
-QtApplication {
+QbsProduct {
type: ["application", "autotest"]
consoleApplication: true
property string testName
@@ -11,14 +11,12 @@ QtApplication {
Depends { name: "Qt.testlib" }
Depends { name: "qbscore" }
Depends { name: "qbsbuildconfig" }
- cpp.defines: [
+ cpp.defines: [ // deliberately override base defines
"QBS_TEST_SUITE_NAME=" + Utilities.cStringQuote(testName.toUpperCase().replace("-", "_"))
]
cpp.includePaths: [
"../../../src",
]
- cpp.cxxLanguageVersion: "c++14"
- cpp.rpaths: qbsbuildconfig.libRPaths
qbs.commonRunEnvironment: ({
"QBS_INSTALL_DIR": FileInfo.joinPaths(qbs.installRoot, qbs.installPrefix)