Merge 2.1 into master

Change-Id: I90fe01f29faa7b3a53ff8a38137af08ea32b85bd

1 files changed, 3 insertions, 2 deletions

diff --git a/doc/reference/items/probe/binary-probe.qdoc b/doc/reference/items/probe/binary-probe.qdoc
index 7c8cd2f42..919d0b89e 100644
--- a/doc/reference/items/probe/binary-probe.qdoc
+++ b/doc/reference/items/probe/binary-probe.qdoc
@@ -50,6 +50,7 @@
     For example, BinaryProbe can be used to search for a protobuf compiler executable as follows:
 
     \code
+    // Assuming module is called "myproto"
     import qbs.File
     import qbs.Probes
 
@@ -70,10 +71,10 @@
         Rule {
             // rule input/outputs here...
 
-            // run executable
+            // run executable for the module called "myproto":
             prepare: {
                 var args = // initialize arguments...
-                var cmd = new Command(executableFilePath, args);
+                var cmd = new Command(input.myproto.executableFilePath, args);
                 cmd.highlight = "codegen";
                 cmd.description = "generating protobuf files for " + input.fileName;
                 return [cmd];