use filePath instead of fileName where applicable

This fixes the recently introduced deprecation warnings.

Task-number: QBS-258
Change-Id: I10660270895ec89a1444d596922c22e9658ca3ab
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

3 files changed, 17 insertions, 17 deletions

diff --git a/src/lib/qtprofilesetup/templates/core.qbs b/src/lib/qtprofilesetup/templates/core.qbs
index 3199e0db5..0d706b255 100644
--- a/src/lib/qtprofilesetup/templates/core.qbs
+++ b/src/lib/qtprofilesetup/templates/core.qbs
@@ -227,8 +227,8 @@ Module {
         }
         prepare: {
             var cmd = new Command(Moc.fullPath(product),
-                                  Moc.args(product, input, output.fileName));
-            cmd.description = 'moc ' + FileInfo.fileName(input.fileName);
+                                  Moc.args(product, input, output.filePath));
+            cmd.description = 'moc ' + FileInfo.fileName(input.filePath);
             cmd.highlight = 'codegen';
             return cmd;
         }
@@ -244,10 +244,10 @@ Module {
         }
         prepare: {
             var cmd = new Command(ModUtils.moduleProperty(product, "binPath") + '/rcc',
-                                  [input.fileName, '-name',
-                                   FileInfo.completeBaseName(input.fileName),
-                                   '-o', output.fileName]);
-            cmd.description = 'rcc ' + FileInfo.fileName(input.fileName);
+                                  [input.filePath, '-name',
+                                   FileInfo.completeBaseName(input.filePath),
+                                   '-o', output.filePath]);
+            cmd.description = 'rcc ' + FileInfo.fileName(input.filePath);
             cmd.highlight = 'codegen';
             return cmd;
         }
@@ -265,8 +265,8 @@ Module {
         prepare: {
             var cmd = new Command(ModUtils.moduleProperty(product, "binPath") + '/'
                                   + ModUtils.moduleProperty(product, "lreleaseName"),
-                                  ['-silent', input.fileName, '-qm', output.fileName]);
-            cmd.description = 'lrelease ' + FileInfo.fileName(input.fileName);
+                                  ['-silent', input.filePath, '-qm', output.filePath]);
+            cmd.description = 'lrelease ' + FileInfo.fileName(input.filePath);
             cmd.highlight = 'filegen';
             return cmd;
         }
@@ -288,8 +288,8 @@ Module {
         }
 
         prepare: {
-            var outputDir = outputs["qdoc-html"][0].fileName;
-            var args = [input.fileName];
+            var outputDir = outputs["qdoc-html"][0].filePath;
+            var args = [input.filePath];
             var qtVersion = ModUtils.moduleProperty(product, "versionMajor");
             if (qtVersion >= 5) {
                 args.push("-outputdir");
@@ -297,7 +297,7 @@ Module {
             }
             var cmd = new Command(ModUtils.moduleProperty(product, "binPath") + '/'
                                   + ModUtils.moduleProperty(product, "qdocName"), args);
-            cmd.description = 'qdoc ' + FileInfo.fileName(input.fileName);
+            cmd.description = 'qdoc ' + FileInfo.fileName(input.filePath);
             cmd.highlight = 'filegen';
             cmd.environment = ModUtils.moduleProperty(product, "qdocEnvironment");
             cmd.environment.push("OUTDIR=" + outputDir); // Qt 4 replacement for -outputdir
@@ -315,13 +315,13 @@ Module {
         }
 
         prepare: {
-            var args = [input.fileName];
+            var args = [input.filePath];
             args = args.concat(ModUtils.moduleProperty(product, "helpGeneratorArgs"));
             args.push("-o");
-            args.push(output.fileName);
+            args.push(output.filePath);
             var cmd = new Command(ModUtils.moduleProperty(product, "binPath") + "/qhelpgenerator",
                                   args);
-            cmd.description = 'qhelpgenerator ' + FileInfo.fileName(input.fileName);
+            cmd.description = 'qhelpgenerator ' + FileInfo.fileName(input.filePath);
             cmd.highlight = 'filegen';
             return cmd;
         }
diff --git a/src/lib/qtprofilesetup/templates/gui.qbs b/src/lib/qtprofilesetup/templates/gui.qbs
index ed04bde41..02b90f40c 100644
--- a/src/lib/qtprofilesetup/templates/gui.qbs
+++ b/src/lib/qtprofilesetup/templates/gui.qbs
@@ -25,8 +25,8 @@ QtModule {
         prepare: {
             var cmd = new Command(ModUtils.moduleProperty(product, "binPath") + '/'
                                   + ModUtils.moduleProperty(product, "uicName"),
-                                  [input.fileName, '-o', output.fileName])
-            cmd.description = 'uic ' + FileInfo.fileName(input.fileName);
+                                  [input.filePath, '-o', output.filePath])
+            cmd.description = 'uic ' + FileInfo.fileName(input.filePath);
             cmd.highlight = 'codegen';
             return cmd;
         }
diff --git a/src/lib/qtprofilesetup/templates/moc.js b/src/lib/qtprofilesetup/templates/moc.js
index e2f278491..d81bb456f 100644
--- a/src/lib/qtprofilesetup/templates/moc.js
+++ b/src/lib/qtprofilesetup/templates/moc.js
@@ -37,7 +37,7 @@ function args(product, input, outputFileName)
                 defines.map(function(item) { return '-D' + item; }),
                 includePaths.map(function(item) { return '-I' + item; }),
                 '-o', outputFileName,
-                input.fileName);
+                input.filePath);
     return args;
 }