diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2024-01-19 17:38:11 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2024-01-29 15:14:49 +0000 |
| commit | 6fa4d2169cc874d9b1a93ead3ef00d85f9baf106 (patch) | |
| tree | 9904c2d89b6b9b2f68ce683dc3d7e0e252f61adb /share/qbs/imports/qbs/Probes | |
| parent | 54fd05f5a893cebcba05d568fb86fcea37102f45 (diff) | |
Remove qbspkgconfig.mergeDependencies
As promised.
Change-Id: I2e13d220057225f1afcad0cab1e5e049313cae2b
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'share/qbs/imports/qbs/Probes')
| -rw-r--r-- | share/qbs/imports/qbs/Probes/QbsPkgConfigProbe.qbs | 6 | ||||
| -rw-r--r-- | share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/share/qbs/imports/qbs/Probes/QbsPkgConfigProbe.qbs b/share/qbs/imports/qbs/Probes/QbsPkgConfigProbe.qbs index 066dc26c3..5acec6bc0 100644 --- a/share/qbs/imports/qbs/Probes/QbsPkgConfigProbe.qbs +++ b/share/qbs/imports/qbs/Probes/QbsPkgConfigProbe.qbs @@ -41,9 +41,6 @@ Probe { property path _sysroot - // TODO: deprecate in 2.2, remove in 2.3 - property bool _mergeDependencies: false - // Output property var packages property var packagesByModuleName @@ -57,8 +54,7 @@ Probe { _libDirs, _staticMode, _definePrefix, - _sysroot, - _mergeDependencies); + _sysroot); packages = result.packages; packagesByModuleName = result.packagesByModuleName; brokenPackages = result.brokenPackages; diff --git a/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js b/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js index abfa3fcf2..3978ac4b6 100644 --- a/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js +++ b/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js @@ -79,7 +79,7 @@ function getQmakePaths(pkg) { } function configure( - executableFilePath, extraPaths, libDirs, staticMode, definePrefix, sysroot, mergeDependencies) { + executableFilePath, extraPaths, libDirs, staticMode, definePrefix, sysroot) { var result = {}; result.packages = []; @@ -94,7 +94,6 @@ function configure( if (options.sysroot) options.allowSystemLibraryPaths = true; options.staticMode = staticMode; - options.mergeDependencies = mergeDependencies; options.extraPaths = extraPaths; if (options.sysroot && !options.libDirs) { options.libDirs = [ |