aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2016-11-22 14:53:43 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2016-11-22 14:52:04 +0000
commitff59d5983a1b6e242d46171e6ca9c86869a9d3cd (patch)
treedc306fa11769a009546a365bb2963535f5a649f0
parent23439cb9211fedd9e429c64709f950061cd71da9 (diff)
Fix usage of ambiguous ids in tst_language::propertiesBlocks
Change-Id: Ice23078476aa36cf32695f773c6f9722151ff489 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--src/lib/corelib/language/testdata/propertiesblocks.qbs52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/lib/corelib/language/testdata/propertiesblocks.qbs b/src/lib/corelib/language/testdata/propertiesblocks.qbs
index ac546feab..db1054f0a 100644
--- a/src/lib/corelib/language/testdata/propertiesblocks.qbs
+++ b/src/lib/corelib/language/testdata/propertiesblocks.qbs
@@ -4,83 +4,83 @@ import "propertiesblocks_base.qbs" as ProductBase
Project {
Product {
name: "property_overwrite"
- Depends { id: cpp; name: "dummy" }
- cpp.defines: ["SOMETHING"]
+ Depends { name: "dummy" }
+ dummy.defines: ["SOMETHING"]
Properties {
condition: true
- cpp.defines: ["OVERWRITTEN"]
+ dummy.defines: ["OVERWRITTEN"]
}
}
Product {
name: "property_overwrite_no_outer"
- Depends { id: cpp; name: "dummy" }
+ Depends { name: "dummy" }
Properties {
condition: true
- cpp.defines: ["OVERWRITTEN"]
+ dummy.defines: ["OVERWRITTEN"]
}
}
Product {
name: "property_append_to_outer"
- Depends { id: cpp; name: "dummy" }
- cpp.defines: ["ONE"]
+ Depends { name: "dummy" }
+ dummy.defines: ["ONE"]
Properties {
condition: true
- cpp.defines: outer.concat(["TWO"])
+ dummy.defines: outer.concat(["TWO"])
}
}
Product {
name: "multiple_exclusive_properties"
- Depends { id: cpp; name: "dummy" }
- cpp.defines: ["SOMETHING"]
+ Depends { name: "dummy" }
+ dummy.defines: ["SOMETHING"]
Properties {
condition: true
- cpp.defines: ["OVERWRITTEN"]
+ dummy.defines: ["OVERWRITTEN"]
}
Properties {
condition: false
- cpp.defines: ["IMPOSSIBLE"]
+ dummy.defines: ["IMPOSSIBLE"]
}
}
Product {
name: "multiple_exclusive_properties_no_outer"
- Depends { id: cpp; name: "dummy" }
+ Depends { name: "dummy" }
Properties {
condition: true
- cpp.defines: ["OVERWRITTEN"]
+ dummy.defines: ["OVERWRITTEN"]
}
Properties {
condition: false
- cpp.defines: ["IMPOSSIBLE"]
+ dummy.defines: ["IMPOSSIBLE"]
}
}
Product {
name: "multiple_exclusive_properties_append_to_outer"
- Depends { id: cpp; name: "dummy" }
- cpp.defines: ["ONE"]
+ Depends { name: "dummy" }
+ dummy.defines: ["ONE"]
Properties {
condition: true
- cpp.defines: outer.concat(["TWO"])
+ dummy.defines: outer.concat(["TWO"])
}
Properties {
condition: false
- cpp.defines: ["IMPOSSIBLE"]
+ dummy.defines: ["IMPOSSIBLE"]
}
}
Product {
name: "ambiguous_properties"
- Depends { id: cpp; name: "dummy" }
- cpp.defines: ["ONE"]
+ Depends { name: "dummy" }
+ dummy.defines: ["ONE"]
Properties {
condition: true
- cpp.defines: outer.concat(["TWO"])
+ dummy.defines: outer.concat(["TWO"])
}
Properties {
condition: false
- cpp.defines: outer.concat(["IMPOSSIBLE"])
+ dummy.defines: outer.concat(["IMPOSSIBLE"])
}
Properties { // will be ignored
condition: true
- cpp.defines: outer.concat(["THREE"])
+ dummy.defines: outer.concat(["THREE"])
}
}
Product {
@@ -153,10 +153,10 @@ Project {
}
Product {
name: "condition_references_id"
- Depends { id: cpp; name: "dummy" }
+ Depends { name: "dummy" }
Properties {
condition: knolf.name === "gnampf"
- cpp.defines: ["OVERWRITTEN"]
+ dummy.defines: ["OVERWRITTEN"]
}
}
Product {