diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2022-09-20 17:39:03 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2022-09-21 12:51:58 +0000 |
| commit | 512001849af89e4b2c5bfb18b039387d6fe7aaa6 (patch) | |
| tree | 3e3dcb1570db6edef0c7ade79a13d78979717412 | |
| parent | 77f50cc5c4f61a8d79843631796a3b81e282c54e (diff) | |
Fix freedesktop module
QML ids are a file-scope thing and should only be used where it's
absolutely necessary.
In this case, the module only worked because of a bug in our evaluator,
which often has too many things in scope.
Change-Id: Idb581f21be3a9145f5a899cab4d64d6e6cfbfbae
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| -rw-r--r-- | share/qbs/modules/freedesktop/FreeDesktop.qbs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/share/qbs/modules/freedesktop/FreeDesktop.qbs b/share/qbs/modules/freedesktop/FreeDesktop.qbs index c892a2615..dbb6d4151 100644 --- a/share/qbs/modules/freedesktop/FreeDesktop.qbs +++ b/share/qbs/modules/freedesktop/FreeDesktop.qbs @@ -33,8 +33,6 @@ import qbs.TextFile import "freedesktop.js" as Fdo Module { - id: fdoModule - property string name: product.name property var desktopKeys @@ -96,14 +94,14 @@ Module { } Group { - condition: fdoModule._fdoSupported + condition: product.freedesktop._fdoSupported fileTagsFilter: [ "freedesktop.desktopfile" ] qbs.install: true qbs.installDir: "share/applications" } Group { - condition: fdoModule._fdoSupported + condition: product.freedesktop._fdoSupported fileTagsFilter: [ "freedesktop.appIcon" ] qbs.install: true qbs.installDir: "share/icons/hicolor/scalable/apps" @@ -115,7 +113,7 @@ Module { } Group { - condition: fdoModule._fdoSupported + condition: product.freedesktop._fdoSupported fileTagsFilter: [ "freedesktop.appstream" ] qbs.install: true qbs.installDir: "share/metainfo" |