aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-01-03 12:15:58 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2018-01-05 09:16:19 +0000
commit2b0f23a49fb63d091c635ce449545a4ec9f5e5cc (patch)
treea9c528051c2abefe68643efc27035697a3952dde /tests
parent53276ef5c99aae0a24771d1f3197b1547d33c036 (diff)
Mark values that were set up as the defaults of built-in item properties
There are several contexts in which we need to find out whether a property value of a built-in item is the default one that was created by us when initializing the item. Rather than using heuristics for that, we now set a flag on such values, so we can always get the correct information. Change-Id: Ieb0d87a423d6c6836a2c1d60ccf503fa0b4f801b Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/language/testdata/exports.qbs2
-rw-r--r--tests/auto/language/testdata/exports_product.qbs1
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/language/testdata/exports.qbs b/tests/auto/language/testdata/exports.qbs
index 64ff6483d..fb9b8a45c 100644
--- a/tests/auto/language/testdata/exports.qbs
+++ b/tests/auto/language/testdata/exports.qbs
@@ -53,7 +53,7 @@ Project {
}
Application {
name: "myapp3"
- Depends { name: "productWithInheritedExportItem" }
+ Depends { name: "productWithInheritedExportItem"; versionAtLeast: "2.0" }
}
Project {
diff --git a/tests/auto/language/testdata/exports_product.qbs b/tests/auto/language/testdata/exports_product.qbs
index 7fd213291..dc4c9f462 100644
--- a/tests/auto/language/testdata/exports_product.qbs
+++ b/tests/auto/language/testdata/exports_product.qbs
@@ -1,5 +1,6 @@
Product {
Export {
+ version: "2.0"
Depends { name: "dummy" }
dummy.cFlags: ["BASE_" + product.name.toUpperCase()]
dummy.cxxFlags: ["-foo"]