diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-07-14 17:04:30 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-07-16 11:56:44 +0200 |
| commit | f7973489aef74b1df55f7466cd176e14bbfa76d0 (patch) | |
| tree | b9be29a1a857082768a341a87081affdfd99cf36 /src/lib/qtprofilesetup/templates | |
| parent | a623153d2b1af3490bab8885f0b3b768511cb42f (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 'src/lib/qtprofilesetup/templates')
| -rw-r--r-- | src/lib/qtprofilesetup/templates/QtPlugin.qbs | 2 | ||||
| -rw-r--r-- | src/lib/qtprofilesetup/templates/core.qbs | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/qtprofilesetup/templates/QtPlugin.qbs b/src/lib/qtprofilesetup/templates/QtPlugin.qbs index 86fd9ff81..25c30101c 100644 --- a/src/lib/qtprofilesetup/templates/QtPlugin.qbs +++ b/src/lib/qtprofilesetup/templates/QtPlugin.qbs @@ -10,7 +10,7 @@ QtModule { Transformer { condition: isStaticLibrary Artifact { - fileName: product.targetName + "_qt_plugin_import_" + filePath: product.targetName + "_qt_plugin_import_" + parent.parent.qtModuleName + ".cpp" fileTags: "cpp" } diff --git a/src/lib/qtprofilesetup/templates/core.qbs b/src/lib/qtprofilesetup/templates/core.qbs index 42adea266..3c95d21db 100644 --- a/src/lib/qtprofilesetup/templates/core.qbs +++ b/src/lib/qtprofilesetup/templates/core.qbs @@ -230,7 +230,7 @@ Module { inputs: ["qrc"] Artifact { - fileName: ModUtils.moduleProperty(product, "generatedFilesDir") + filePath: ModUtils.moduleProperty(product, "generatedFilesDir") + "/qrc_" + input.completeBaseName + ".cpp"; fileTags: ["cpp"] } @@ -249,7 +249,7 @@ Module { inputs: ["ts"] Artifact { - fileName: FileInfo.joinPaths(ModUtils.moduleProperty(product, "qmFilesDir"), + filePath: FileInfo.joinPaths(ModUtils.moduleProperty(product, "qmFilesDir"), input.completeBaseName + ".qm") fileTags: ["qm"] } @@ -269,12 +269,12 @@ Module { explicitlyDependsOn: ["qdoc", "qdocconf"] Artifact { - fileName: ModUtils.moduleProperty(product, "generatedFilesDir") + "/html" + filePath: ModUtils.moduleProperty(product, "generatedFilesDir") + "/html" fileTags: ["qdoc-html"] } Artifact { - fileName: ModUtils.moduleProperty(product, "generatedFilesDir") + "/html/" + filePath: ModUtils.moduleProperty(product, "generatedFilesDir") + "/html/" + ModUtils.moduleProperty(product, "qdocQhpFileName") fileTags: ["qhp"] } @@ -301,7 +301,7 @@ Module { inputs: "qhp" Artifact { - fileName: ModUtils.moduleProperty(product, "generatedFilesDir") + filePath: ModUtils.moduleProperty(product, "generatedFilesDir") + '/' + input.completeBaseName + ".qch" fileTags: ["qch"] } |