diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2023-05-03 07:55:59 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2023-05-03 10:18:15 +0000 |
| commit | f68c57aa2bb2846794e5d1240121f4398d0a59ce (patch) | |
| tree | d046eeaf1049c64ac6de27112f9f06d6d81915b4 | |
| parent | 1f5f46e572cf7ffcd2ae4e90024349928719ba35 (diff) | |
| download | qbs-f68c57aa2bb2846794e5d1240121f4398d0a59ce.tar.gz | |
Do not merge deps in pkgconfig by default
This was needed only as a workaround for packages with deep dependency
tree. With the new module loader code, this is not needed anymore and we
can start removing the prop.
Fixes: QBS-1710
Change-Id: I47046049e89e705288f1b1ae04be625bd83302e8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | doc/reference/module-providers/qbspkgconfig-module-provider.qdoc | 6 | ||||
| -rw-r--r-- | share/qbs/module-providers/qbspkgconfig.qbs | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/doc/reference/module-providers/qbspkgconfig-module-provider.qdoc b/doc/reference/module-providers/qbspkgconfig-module-provider.qdoc index debaa5992..f9c4e9ade 100644 --- a/doc/reference/module-providers/qbspkgconfig-module-provider.qdoc +++ b/doc/reference/module-providers/qbspkgconfig-module-provider.qdoc @@ -116,9 +116,7 @@ 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. + may depend on other modules and property merging is done by \QBS. - \defaultvalue \c true + \defaultvalue \c false */ diff --git a/share/qbs/module-providers/qbspkgconfig.qbs b/share/qbs/module-providers/qbspkgconfig.qbs index 599f76d33..2736220a8 100644 --- a/share/qbs/module-providers/qbspkgconfig.qbs +++ b/share/qbs/module-providers/qbspkgconfig.qbs @@ -58,7 +58,8 @@ ModuleProvider { property path sysroot: qbs.toolchain && qbs.toolchain.includes("xcode") ? undefined : qbs.sysroot - property bool mergeDependencies: true + // TODO: deprecate in 2.2, remove in 2.3 + property bool mergeDependencies: false relativeSearchPaths: { |