diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-05-15 20:21:49 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-05-16 14:25:13 +0000 |
| commit | 42c99ec8f78b3581c3b766d9867ea8797d068280 (patch) | |
| tree | ec1619102e2076ff52f82839ed4b6bd7562a1b2d | |
| parent | c84efda483e0333e7963f260ea4eae42a8df4f50 (diff) | |
Do not override properties that are present in user plist
Fixes: QBS-1447
Change-Id: Ie03530e960cbcf0ab14a9cb501a169aec311ec1a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/modules/bundle/BundleModule.qbs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs index ec0062347..f1845fe30 100644 --- a/share/qbs/modules/bundle/BundleModule.qbs +++ b/share/qbs/modules/bundle/BundleModule.qbs @@ -426,7 +426,8 @@ Module { inputs.partial_infoplist[j].filePath) || {}; for (key in partialInfoPlist) { - if (partialInfoPlist.hasOwnProperty(key)) + if (partialInfoPlist.hasOwnProperty(key) + && !aggregatePlist.hasOwnProperty(key)) aggregatePlist[key] = partialInfoPlist[key]; } } |