Merge remote-tracking branch 'origin/1.1'

Change-Id: Ieeeeb2a30358031b11a902e97c8b8a0046df76d6

1 files changed, 2 insertions, 0 deletions

diff --git a/tests/auto/blackbox/testdata/ruleConditions/modules/narfzort/narfzort.qbs b/tests/auto/blackbox/testdata/ruleConditions/modules/narfzort/narfzort.qbs
index 988c6657e..75bebf74d 100644
--- a/tests/auto/blackbox/testdata/ruleConditions/modules/narfzort/narfzort.qbs
+++ b/tests/auto/blackbox/testdata/ruleConditions/modules/narfzort/narfzort.qbs
@@ -1,4 +1,5 @@
 import qbs 1.0
+import qbs.FileInfo
 import qbs.TextFile
 
 Module {
@@ -16,6 +17,7 @@ Module {
         }
         prepare: {
             var cmd = new JavaScriptCommand();
+            cmd.description = "generating " + FileInfo.fileName(output.fileName);
             cmd.sourceCode = function() {
                     var f = new TextFile(output.fileName, TextFile.WriteOnly);
                     f.write("NARF! ZORT!");