aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/blackbox/testdata
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2014-07-14 17:04:30 +0200
committerJoerg Bornemann <joerg.bornemann@digia.com>2014-07-16 11:56:44 +0200
commitf7973489aef74b1df55f7466cd176e14bbfa76d0 (patch)
treeb9be29a1a857082768a341a87081affdfd99cf36 /tests/auto/blackbox/testdata
parenta623153d2b1af3490bab8885f0b3b768511cb42f (diff)
deprecate Artifact.fileName in favor of Artifact.filePath
This property is actually a file path, not a mere name. Task-number: QBS-579 Change-Id: I04e8f03eac97b5f86fe743a4923888a3d2a82c5d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests/auto/blackbox/testdata')
-rw-r--r--tests/auto/blackbox/testdata/build-directories/project.qbs4
-rw-r--r--tests/auto/blackbox/testdata/codegen/codegen.qbs2
-rw-r--r--tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs2
-rw-r--r--tests/auto/blackbox/testdata/erroneous/nonexistentWorkingDir/project.qbs2
-rw-r--r--tests/auto/blackbox/testdata/explicitlyDependsOn/project.qbs2
-rw-r--r--tests/auto/blackbox/testdata/fileTagger/moc_cpp.qbs2
-rw-r--r--tests/auto/blackbox/testdata/productproperties/header.qbs2
-rw-r--r--tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs2
-rw-r--r--tests/auto/blackbox/testdata/propertyChanges/project.qbs4
-rw-r--r--tests/auto/blackbox/testdata/qt5plugin/plugin.qbs2
-rw-r--r--tests/auto/blackbox/testdata/rad-after-incomplete-build/project_with_rule.qbs2
-rw-r--r--tests/auto/blackbox/testdata/rad-after-incomplete-build/project_with_transformer.qbs2
-rw-r--r--tests/auto/blackbox/testdata/ruleCycle/ruleCycle.qbs4
-rw-r--r--tests/auto/blackbox/testdata/trackFileTags/after/project.qbs4
-rw-r--r--tests/auto/blackbox/testdata/trackFileTags/before/project.qbs4
-rw-r--r--tests/auto/blackbox/testdata/transformers/transformers.qbs6
-rw-r--r--tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/project.qbs4
17 files changed, 25 insertions, 25 deletions
diff --git a/tests/auto/blackbox/testdata/build-directories/project.qbs b/tests/auto/blackbox/testdata/build-directories/project.qbs
index cb83999e2..4d2758527 100644
--- a/tests/auto/blackbox/testdata/build-directories/project.qbs
+++ b/tests/auto/blackbox/testdata/build-directories/project.qbs
@@ -6,7 +6,7 @@ Project {
type: "blubb1"
Transformer {
Artifact {
- fileName: "dummy1.txt"
+ filePath: "dummy1.txt"
fileTags: product.type
}
prepare: {
@@ -26,7 +26,7 @@ Project {
Rule {
usings: "blubb1"
Artifact {
- fileName: "dummy2.txt"
+ filePath: "dummy2.txt"
fileTags: product.type
}
prepare: {
diff --git a/tests/auto/blackbox/testdata/codegen/codegen.qbs b/tests/auto/blackbox/testdata/codegen/codegen.qbs
index 1a05ad4f0..4b440fc51 100644
--- a/tests/auto/blackbox/testdata/codegen/codegen.qbs
+++ b/tests/auto/blackbox/testdata/codegen/codegen.qbs
@@ -25,7 +25,7 @@ Project {
inputs: ['text']
Artifact {
fileTags: ['cpp']
- fileName: input.baseName + '.cpp'
+ filePath: input.baseName + '.cpp'
}
prepare: {
function expandMacros(str, table)
diff --git a/tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs b/tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs
index a5ff12eb2..836463379 100644
--- a/tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs
+++ b/tests/auto/blackbox/testdata/dependenciesProperty/dependenciesProperty.qbs
@@ -10,7 +10,7 @@ Project {
Transformer {
Artifact {
fileTags: ["deps"]
- fileName: product.name + '.deps'
+ filePath: product.name + '.deps'
}
prepare: {
var cmd = new JavaScriptCommand();
diff --git a/tests/auto/blackbox/testdata/erroneous/nonexistentWorkingDir/project.qbs b/tests/auto/blackbox/testdata/erroneous/nonexistentWorkingDir/project.qbs
index db0b0d607..6433d80d9 100644
--- a/tests/auto/blackbox/testdata/erroneous/nonexistentWorkingDir/project.qbs
+++ b/tests/auto/blackbox/testdata/erroneous/nonexistentWorkingDir/project.qbs
@@ -4,7 +4,7 @@ Application {
name: "kaputt"
Transformer {
Artifact {
- fileName: "Stulle"
+ filePath: "Stulle"
fileTags: ["nutritious"]
}
prepare: {
diff --git a/tests/auto/blackbox/testdata/explicitlyDependsOn/project.qbs b/tests/auto/blackbox/testdata/explicitlyDependsOn/project.qbs
index 57172a442..3db802717 100644
--- a/tests/auto/blackbox/testdata/explicitlyDependsOn/project.qbs
+++ b/tests/auto/blackbox/testdata/explicitlyDependsOn/project.qbs
@@ -11,7 +11,7 @@ Product {
Transformer {
explicitlyDependsOn: "txt"
Artifact {
- fileName: "test.mytype"
+ filePath: "test.mytype"
fileTags: product.type
}
prepare: {
diff --git a/tests/auto/blackbox/testdata/fileTagger/moc_cpp.qbs b/tests/auto/blackbox/testdata/fileTagger/moc_cpp.qbs
index c9d64c8bb..ce7970f20 100644
--- a/tests/auto/blackbox/testdata/fileTagger/moc_cpp.qbs
+++ b/tests/auto/blackbox/testdata/fileTagger/moc_cpp.qbs
@@ -21,7 +21,7 @@ Project {
inputs: ['text']
Artifact {
fileTags: ['cpp']
- fileName: input.baseName + '.cpp'
+ filePath: input.baseName + '.cpp'
}
prepare: {
var cmd = new JavaScriptCommand();
diff --git a/tests/auto/blackbox/testdata/productproperties/header.qbs b/tests/auto/blackbox/testdata/productproperties/header.qbs
index 56ad8fc78..ee08de1e2 100644
--- a/tests/auto/blackbox/testdata/productproperties/header.qbs
+++ b/tests/auto/blackbox/testdata/productproperties/header.qbs
@@ -9,7 +9,7 @@ Product {
Transformer {
Artifact {
- fileName: "blubb_header.h"
+ filePath: "blubb_header.h"
fileTags: "hpp"
}
prepare: {
diff --git a/tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs b/tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs
index 1c3e363c9..ea63b09b2 100644
--- a/tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs
+++ b/tests/auto/blackbox/testdata/propertyChanges/modules/TestModule/module.qbs
@@ -11,7 +11,7 @@ Module {
inputs: ['test-input']
Artifact {
fileTags: "test-output"
- fileName: input.fileName + ".out"
+ filePath: input.fileName + ".out"
}
prepare: {
diff --git a/tests/auto/blackbox/testdata/propertyChanges/project.qbs b/tests/auto/blackbox/testdata/propertyChanges/project.qbs
index f6a48e1d4..02c9633db 100644
--- a/tests/auto/blackbox/testdata/propertyChanges/project.qbs
+++ b/tests/auto/blackbox/testdata/propertyChanges/project.qbs
@@ -31,7 +31,7 @@ Project {
property string fileContentPrefix: "prefix 1"
Transformer {
- Artifact { fileName: "nothing" }
+ Artifact { filePath: "nothing" }
prepare: {
var cmd = new JavaScriptCommand();
cmd.silent = true;
@@ -41,7 +41,7 @@ Project {
}
Transformer {
- Artifact { fileName: "generated.txt" }
+ Artifact { filePath: "generated.txt" }
prepare: {
var cmd = new JavaScriptCommand();
cmd.description = "generating " + output.filePath;
diff --git a/tests/auto/blackbox/testdata/qt5plugin/plugin.qbs b/tests/auto/blackbox/testdata/qt5plugin/plugin.qbs
index d704ab385..2944198f3 100644
--- a/tests/auto/blackbox/testdata/qt5plugin/plugin.qbs
+++ b/tests/auto/blackbox/testdata/qt5plugin/plugin.qbs
@@ -27,7 +27,7 @@ DynamicLibrary {
condition: Qt.core.versionMajor >= 5
inputs: ["echoplugin.json.source"]
Artifact {
- fileName: "echoplugin.json"
+ filePath: "echoplugin.json"
fileTags: ["qt_plugin_metadata"]
}
prepare: {
diff --git a/tests/auto/blackbox/testdata/rad-after-incomplete-build/project_with_rule.qbs b/tests/auto/blackbox/testdata/rad-after-incomplete-build/project_with_rule.qbs
index 8d36c6d11..42ec452db 100644
--- a/tests/auto/blackbox/testdata/rad-after-incomplete-build/project_with_rule.qbs
+++ b/tests/auto/blackbox/testdata/rad-after-incomplete-build/project_with_rule.qbs
@@ -11,7 +11,7 @@ Product {
inputs: "input"
Artifact {
fileTags: "custom"
- fileName: "oldfile"
+ filePath: "oldfile"
}
prepare: {
var cmd = new JavaScriptCommand();
diff --git a/tests/auto/blackbox/testdata/rad-after-incomplete-build/project_with_transformer.qbs b/tests/auto/blackbox/testdata/rad-after-incomplete-build/project_with_transformer.qbs
index a36bd108f..dd4b4baed 100644
--- a/tests/auto/blackbox/testdata/rad-after-incomplete-build/project_with_transformer.qbs
+++ b/tests/auto/blackbox/testdata/rad-after-incomplete-build/project_with_transformer.qbs
@@ -6,7 +6,7 @@ Product {
Transformer {
Artifact {
fileTags: "custom"
- fileName: "oldfile"
+ filePath: "oldfile"
}
prepare: {
var cmd = new JavaScriptCommand();
diff --git a/tests/auto/blackbox/testdata/ruleCycle/ruleCycle.qbs b/tests/auto/blackbox/testdata/ruleCycle/ruleCycle.qbs
index eca5cfa76..a7a16ccc2 100644
--- a/tests/auto/blackbox/testdata/ruleCycle/ruleCycle.qbs
+++ b/tests/auto/blackbox/testdata/ruleCycle/ruleCycle.qbs
@@ -20,7 +20,7 @@ Project {
Rule {
inputs: ["cow"]
Artifact {
- fileName: input.completeBaseName + ".cow_pat"
+ filePath: input.completeBaseName + ".cow_pat"
fileTags: ["cow_pat"]
}
prepare: { print("The cow pat falls out of the cow."); }
@@ -28,7 +28,7 @@ Project {
Rule {
inputs: ["cow_pat"]
Artifact {
- fileName: input.completeBaseName + ".fertilizer"
+ filePath: input.completeBaseName + ".fertilizer"
fileTags: ["fertilizer"]
}
prepare: { print("The cow pat is used as fertilizer."); }
diff --git a/tests/auto/blackbox/testdata/trackFileTags/after/project.qbs b/tests/auto/blackbox/testdata/trackFileTags/after/project.qbs
index df04be64b..e173d5fb2 100644
--- a/tests/auto/blackbox/testdata/trackFileTags/after/project.qbs
+++ b/tests/auto/blackbox/testdata/trackFileTags/after/project.qbs
@@ -15,7 +15,7 @@ Project {
Rule {
inputs: ["foosource"]
Artifact {
- fileName: input.baseName + ".foo"
+ filePath: input.baseName + ".foo"
fileTags: ["foo"]
}
@@ -33,7 +33,7 @@ Project {
Rule {
inputs: ["foo"]
Artifact {
- fileName: input.baseName + "_foo.cpp"
+ filePath: input.baseName + "_foo.cpp"
fileTags: ["cpp"]
}
diff --git a/tests/auto/blackbox/testdata/trackFileTags/before/project.qbs b/tests/auto/blackbox/testdata/trackFileTags/before/project.qbs
index 8bfd66d53..521bf528d 100644
--- a/tests/auto/blackbox/testdata/trackFileTags/before/project.qbs
+++ b/tests/auto/blackbox/testdata/trackFileTags/before/project.qbs
@@ -15,7 +15,7 @@ Project {
Rule {
inputs: ["foosource"]
Artifact {
- fileName: input.baseName + ".foo"
+ filePath: input.baseName + ".foo"
fileTags: ["foo"]
}
@@ -33,7 +33,7 @@ Project {
Rule {
inputs: ["foo"]
Artifact {
- fileName: input.baseName + "_foo.cpp"
+ filePath: input.baseName + "_foo.cpp"
fileTags: ["cpp"]
}
diff --git a/tests/auto/blackbox/testdata/transformers/transformers.qbs b/tests/auto/blackbox/testdata/transformers/transformers.qbs
index efd5cd9ad..a0b1d70b0 100644
--- a/tests/auto/blackbox/testdata/transformers/transformers.qbs
+++ b/tests/auto/blackbox/testdata/transformers/transformers.qbs
@@ -15,7 +15,7 @@ Project {
Transformer {
// no inputs -> just a generator
Artifact {
- fileName: "foo.txt"
+ filePath: "foo.txt"
fileTags: "text"
}
prepare: {
@@ -37,7 +37,7 @@ Project {
Transformer {
// no inputs -> just a generator
Artifact {
- fileName: "foo.xml"
+ filePath: "foo.xml"
fileTags: "xml"
}
prepare: {
@@ -62,7 +62,7 @@ Project {
Transformer {
inputs: ["main.cpp"] // will be taken from the source dir
Artifact {
- fileName: "bar.txt"
+ filePath: "bar.txt"
fileTags: "text"
}
prepare: {
diff --git a/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/project.qbs b/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/project.qbs
index 80644232e..899b4445f 100644
--- a/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/project.qbs
+++ b/tests/auto/blackbox/testdata/usings-as-sole-inputs-non-multiplexed/project.qbs
@@ -23,7 +23,7 @@ Project {
Rule {
inputs: "custom.in"
Artifact {
- fileName: FileInfo.baseName(input.filePath) + ".out"
+ filePath: FileInfo.baseName(input.filePath) + ".out"
fileTags: "custom"
}
prepare: {
@@ -45,7 +45,7 @@ Project {
Rule {
usings: "custom"
Artifact {
- fileName: FileInfo.fileName(input.filePath) + ".plus"
+ filePath: FileInfo.fileName(input.filePath) + ".plus"
fileTags: "custom-plus"
}
prepare: {