diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2023-08-21 03:49:35 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2023-09-01 22:22:39 +0000 |
| commit | 51e58390f2b34b27d15e7f287353451a6a969a33 (patch) | |
| tree | c85ef26adc66b4eb85f4724bd9e27a0c1d3a4345 | |
| parent | 9a74d56a32e0d041bf521598dadc898a4c7a07f6 (diff) | |
pkgconfig: deprecate mergeDependencies prop
Change-Id: Ibf553f9065e8002ba4dadd961de08d6f1951189a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | doc/reference/module-providers/qbspkgconfig-module-provider.qdoc | 3 | ||||
| -rw-r--r-- | share/qbs/module-providers/qbspkgconfig.qbs | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/reference/module-providers/qbspkgconfig-module-provider.qdoc b/doc/reference/module-providers/qbspkgconfig-module-provider.qdoc index f9c4e9ade..e48be1633 100644 --- a/doc/reference/module-providers/qbspkgconfig-module-provider.qdoc +++ b/doc/reference/module-providers/qbspkgconfig-module-provider.qdoc @@ -111,6 +111,7 @@ /*! \qmlproperty bool qbspkgconfig::mergeDependencies + \obsolete Holds whether dependencies should be merged by pkg-config or \QBS. @@ -119,4 +120,6 @@ may depend on other modules and property merging is done by \QBS. \defaultvalue \c false + + Deprecated in \QBS 2.2.0. */ diff --git a/share/qbs/module-providers/qbspkgconfig.qbs b/share/qbs/module-providers/qbspkgconfig.qbs index 2736220a8..4eda7cb13 100644 --- a/share/qbs/module-providers/qbspkgconfig.qbs +++ b/share/qbs/module-providers/qbspkgconfig.qbs @@ -58,8 +58,11 @@ ModuleProvider { property path sysroot: qbs.toolchain && qbs.toolchain.includes("xcode") ? undefined : qbs.sysroot - // TODO: deprecate in 2.2, remove in 2.3 property bool mergeDependencies: false + PropertyOptions { + name: "mergeDependencies" + removalVersion: "2.3.0" + } relativeSearchPaths: { |