aboutsummaryrefslogtreecommitdiffstats
path: root/doc/reference/module-providers/qbspkgconfig-module-provider.qdoc
diff options
context:
space:
mode:
Diffstat (limited to 'doc/reference/module-providers/qbspkgconfig-module-provider.qdoc')
-rw-r--r--doc/reference/module-providers/qbspkgconfig-module-provider.qdoc39
1 files changed, 24 insertions, 15 deletions
diff --git a/doc/reference/module-providers/qbspkgconfig-module-provider.qdoc b/doc/reference/module-providers/qbspkgconfig-module-provider.qdoc
index debaa5992..a7f6fe6b7 100644
--- a/doc/reference/module-providers/qbspkgconfig-module-provider.qdoc
+++ b/doc/reference/module-providers/qbspkgconfig-module-provider.qdoc
@@ -87,6 +87,29 @@
*/
/*!
+ \qmlproperty bool qbspkgconfig::definePrefix
+
+ If this property is \c true, then \QBS will override the ${prefix} variable in the packages
+ with a value that is guessed based on the location of the .pc file.
+
+ This option corresponds to the \c --define-prefix / \c --dont-define-prefix command line
+ options of the \c pkg-config tool.
+
+ \defaultvalue \c true on Windows, \c false otherwise
+*/
+
+/*!
+ \qmlproperty stringList qbspkgconfig::executableNames
+
+ The names of the \c pkg-config executable to search for.
+
+ Note that since newer distributions use \l{http://pkgconf.org}{pkgconf} by default, it has
+ higher priority over \c pkg-config.
+
+ \defaultvalue \c{["pkgconf", "pkg-config"]}
+*/
+
+/*!
\qmlproperty path qbspkgconfig::sysroot
Set this property if you need to overwrite the default search sysroot path used by
@@ -100,7 +123,7 @@
Setting this property to \c undefined or empty (\c "") value will use pkg-config's default
search paths:
\code
- qbs build module-providers.pkgconfig.sysroot:undefined
+ qbs resolve moduleProviders.qbspkgconfig.sysroot:undefined
\endcode
This property is the equivalent of the \c{PKG_CONFIG_SYSROOT_DIR} variable for the
@@ -108,17 +131,3 @@
\defaultvalue \c "" on macOS, \c qbs.sysroot on other platforms
*/
-
-/*!
- \qmlproperty bool qbspkgconfig::mergeDependencies
-
- Holds whether dependencies should be merged by pkg-config or \QBS.
-
- If set to true, dependencies are merged by pkg-config meaning each generated module
- is self-contained and does not depend on other modules. If set to false, generated modules
- may depend on other modules and property merging is done by \QBS. The latter approach gives
- \QBS more information about dependencies, but may have performance implications during resolve
- phase, e.g. when using ABSEIL library.
-
- \defaultvalue \c true
-*/