Merge remote-tracking branch 'origin/3.1'

Conflicts:
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d

1 files changed, 6 insertions, 6 deletions

diff --git a/qbs/modules/pluginspec/pluginspec.qbs b/qbs/modules/pluginspec/pluginspec.qbs
index f7e9127306..2b57b53d89 100644
--- a/qbs/modules/pluginspec/pluginspec.qbs
+++ b/qbs/modules/pluginspec/pluginspec.qbs
@@ -17,7 +17,7 @@ Module {
 
         prepare: {
             var cmd = new JavaScriptCommand();
-            cmd.description = "prepare " + FileInfo.fileName(output.fileName);
+            cmd.description = "prepare " + FileInfo.fileName(output.filePath);
             cmd.highlight = "codegen";
             cmd.pluginspecreplacements = product.pluginspecreplacements;
             cmd.plugin_depends = [];
@@ -36,7 +36,7 @@ Module {
             cmd.sourceCode = function() {
                 var i;
                 var vars = pluginspecreplacements || {};
-                var inf = new TextFile(input.fileName);
+                var inf = new TextFile(input.filePath);
                 var all = inf.readAll();
                 // replace quoted quotes
                 all = all.replace(/\\\"/g, '"');
@@ -58,7 +58,7 @@ Module {
                 for (i in vars) {
                     all = all.replace(new RegExp('\\\$\\\$' + i + '(?!\w)', 'g'), vars[i]);
                 }
-                var file = new TextFile(output.fileName, TextFile.WriteOnly);
+                var file = new TextFile(output.filePath, TextFile.WriteOnly);
                 file.truncate();
                 file.write(all);
                 file.close();
@@ -85,12 +85,12 @@ Module {
             var args = [
                 "-no-format",
                 "-output",
-                output.fileName,
+                output.filePath,
                 xslFile,
-                input.fileName
+                input.filePath
             ];
             var cmd = new Command(xmlPatternsPath, args);
-            cmd.description = "generating " + FileInfo.fileName(output.fileName);
+            cmd.description = "generating " + FileInfo.fileName(output.filePath);
             cmd.highlight = "codegen";
             return cmd;
         }