aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2024-01-21 00:17:19 +0300
committerIvan Komissarov <ABBAPOH@gmail.com>2024-01-22 14:47:24 +0000
commit0d589c18b570ce895cf3d6e69545439c2f68ebac (patch)
tree66cc74fdcb20324f9077b3d170161f138d14b824
parente45a00bcbc37c037ca1da0629dbeecf4037c98aa (diff)
qbspkgconfig: fix mergeDependencies propv2.2.22.2
This prop was broken during refactoring. This amends d99256dd79460628aafb5fa34a8dde7761ff7b1c. Change-Id: I7932fc22e97c7af18bb269ddc2344c8745a82002 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--share/qbs/module-providers/qbspkgconfig.qbs1
1 files changed, 1 insertions, 0 deletions
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 {