diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2021-08-20 14:21:23 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2021-08-20 14:21:23 +0200 |
commit | 321e4243c443c38239a50921a9faf4aa0d122bac (patch) | |
tree | 1618ad7beea92a0bff1106bac32fa7c1b0ba9f18 /tests/auto/language/testdata/inherited-properties-items/imports | |
parent | 4d85d558597f9405b9c9d20446156cd63d5b09c2 (diff) | |
parent | 1d0a0a9c2af318c8e3e7bd4be444854ab8f4ae34 (diff) |
Merge 1.20 into master
Change-Id: Id78213238c8692d7aaa1a73378704fa9ef4238a9
Diffstat (limited to 'tests/auto/language/testdata/inherited-properties-items/imports')
-rw-r--r-- | tests/auto/language/testdata/inherited-properties-items/imports/DebugName.qbs | 2 | ||||
-rw-r--r-- | tests/auto/language/testdata/inherited-properties-items/imports/ReleaseName.qbs | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/language/testdata/inherited-properties-items/imports/DebugName.qbs b/tests/auto/language/testdata/inherited-properties-items/imports/DebugName.qbs index 5ac15658c..d129dc9db 100644 --- a/tests/auto/language/testdata/inherited-properties-items/imports/DebugName.qbs +++ b/tests/auto/language/testdata/inherited-properties-items/imports/DebugName.qbs @@ -1,5 +1,3 @@ -import qbs - Properties { condition: qbs.buildVariant === "debug" name: "product_debug" diff --git a/tests/auto/language/testdata/inherited-properties-items/imports/ReleaseName.qbs b/tests/auto/language/testdata/inherited-properties-items/imports/ReleaseName.qbs index e33c5652b..57ab96a7e 100644 --- a/tests/auto/language/testdata/inherited-properties-items/imports/ReleaseName.qbs +++ b/tests/auto/language/testdata/inherited-properties-items/imports/ReleaseName.qbs @@ -1,5 +1,3 @@ -import qbs - Properties { condition: qbs.buildVariant === "release" name: "product_release" |