From 0d589c18b570ce895cf3d6e69545439c2f68ebac Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Sun, 21 Jan 2024 00:17:19 +0300 Subject: qbspkgconfig: fix mergeDependencies prop This prop was broken during refactoring. This amends d99256dd79460628aafb5fa34a8dde7761ff7b1c. Change-Id: I7932fc22e97c7af18bb269ddc2344c8745a82002 Reviewed-by: Christian Kandeler --- share/qbs/module-providers/qbspkgconfig.qbs | 1 + 1 file changed, 1 insertion(+) diff --git a/share/qbs/module-providers/qbspkgconfig.qbs b/share/qbs/module-providers/qbspkgconfig.qbs index 648ec8649..d5257aa55 100644 --- a/share/qbs/module-providers/qbspkgconfig.qbs +++ b/share/qbs/module-providers/qbspkgconfig.qbs @@ -77,6 +77,7 @@ ModuleProvider { _libDirs: parent.libDirs _staticMode: parent.staticMode _definePrefix: parent.definePrefix + _mergeDependencies: parent.mergeDependencies } Probes.QmakeProbe { -- cgit v1.2.3