diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2016-08-31 13:15:36 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-09-01 09:59:49 +0000 |
commit | 0f41162ce0a35a557d5beb4df897a57a6a7050e5 (patch) | |
tree | 5643bcf81803712d98444cee307d7a488be12f19 | |
parent | c3df81d3caed7ea65c15f39a3dfe59c58193ea6e (diff) |
Tests: Fix the type of some values assigned to properties
We don't want to rely on implicit conversions.
Change-Id: Id4681fb088c05742488cd6b3d937cddfb82ff35c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
4 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/corelib/language/testdata/propertiesblocks.qbs b/src/lib/corelib/language/testdata/propertiesblocks.qbs index 0ac962e16..ac546feab 100644 --- a/src/lib/corelib/language/testdata/propertiesblocks.qbs +++ b/src/lib/corelib/language/testdata/propertiesblocks.qbs @@ -85,7 +85,7 @@ Project { } Product { name: "condition_refers_to_product_property" - property string narf: true + property bool narf: true property string someString: "SOMETHING" Depends { name: "dummy" } Properties { @@ -94,7 +94,7 @@ Project { someString: "OVERWRITTEN" } } - property string zort: true + property bool zort: true Product { name: "condition_refers_to_project_property" property string someString: "SOMETHING" diff --git a/tests/auto/blackbox/testdata/productproperties/project.qbs b/tests/auto/blackbox/testdata/productproperties/project.qbs index e190e6bbf..75c6224bc 100644 --- a/tests/auto/blackbox/testdata/productproperties/project.qbs +++ b/tests/auto/blackbox/testdata/productproperties/project.qbs @@ -1,6 +1,6 @@ import qbs 1.0 Project { - property string blubbProp: 5 + property string blubbProp: "5" references: ["header.qbs", "app.qbs"] } diff --git a/tests/auto/blackbox/testdata/rule-with-no-inputs/rule-with-no-inputs.qbs b/tests/auto/blackbox/testdata/rule-with-no-inputs/rule-with-no-inputs.qbs index 2ba97cfa6..3792f977d 100644 --- a/tests/auto/blackbox/testdata/rule-with-no-inputs/rule-with-no-inputs.qbs +++ b/tests/auto/blackbox/testdata/rule-with-no-inputs/rule-with-no-inputs.qbs @@ -4,7 +4,7 @@ import qbs.TextFile Product { name: "theProduct" type: ["output"] - property int version: 1 + version: "1" Rule { inputs: [] multiplex: true diff --git a/tests/auto/blackbox/testdata/typescript/typescript.qbs b/tests/auto/blackbox/testdata/typescript/typescript.qbs index d15e9db50..b6604830f 100644 --- a/tests/auto/blackbox/testdata/typescript/typescript.qbs +++ b/tests/auto/blackbox/testdata/typescript/typescript.qbs @@ -5,7 +5,7 @@ Project { Depends { name: "typescript" } Depends { name: "lib" } - typescript.warningLevel: ["pedantic"] + typescript.warningLevel: "pedantic" typescript.generateDeclarations: true typescript.moduleLoader: "commonjs" nodejs.applicationFile: "main.ts" |