aboutsummaryrefslogtreecommitdiffstats
path: root/doc/reference/items/probe
diff options
context:
space:
mode:
Diffstat (limited to 'doc/reference/items/probe')
-rw-r--r--doc/reference/items/probe/binary-probe.qdoc5
-rw-r--r--doc/reference/items/probe/conanfile-probe.qdoc3
-rw-r--r--doc/reference/items/probe/pkgconfig-probe.qdoc11
3 files changed, 12 insertions, 7 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];
diff --git a/doc/reference/items/probe/conanfile-probe.qdoc b/doc/reference/items/probe/conanfile-probe.qdoc
index cc91b9237..f1b30f0c3 100644
--- a/doc/reference/items/probe/conanfile-probe.qdoc
+++ b/doc/reference/items/probe/conanfile-probe.qdoc
@@ -43,6 +43,9 @@
properties in products. \c ConanfileProbe can also be used to run other
Conan generators and to retrieve their output.
+ \note This probe only works with Conan 1.x since the \c json generator was removed in Conan
+ 2.0. Use the \l{conan}{conan} module provider and \c QbsDeps generator with Conan 2.0 instead.
+
\section1 Examples
In the following examples we assume that our project contains a \c conanfile.py.
diff --git a/doc/reference/items/probe/pkgconfig-probe.qdoc b/doc/reference/items/probe/pkgconfig-probe.qdoc
index 22fd510ac..66e008601 100644
--- a/doc/reference/items/probe/pkgconfig-probe.qdoc
+++ b/doc/reference/items/probe/pkgconfig-probe.qdoc
@@ -51,8 +51,12 @@
maxVersion: '5.99.99'
}
files: 'main.cpp'
- cpp.cxxFlags: pkgConfig.cflags
- cpp.linkerFlags: pkgConfig.libs
+ cpp.defines : pkgConfig.defines
+ cpp.includePaths: pkgConfig.includePaths
+ cpp.dynamicLibraries: pkgConfig.libraries
+ cpp.libraryPaths: pkgConfig.libraryPaths
+ cpp.commonCompilerFlags: pkgConfig.compilerFlags
+ cpp.linkerFlags: pkgConfig.linkerFlags
}
\endcode
*/
@@ -194,9 +198,6 @@
This output property contains the list of library paths that should be passed to a linker when
using requested package.
- This property sets the value of the PKG_CONFIG_LIBDIR environment variable passed to
- the \c pkg-config binary.
-
\nodefaultvalue
*/