diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2023-03-09 13:20:20 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-03-15 09:20:41 +0000 |
| commit | 33d129352a2674fdc8fc8c26b826a78f10e5f7a6 (patch) | |
| tree | 1d37e0fc51f0ab9ba62f0236796ae7475e28d55f | |
| parent | 3115f086efef4aebbb1f014bc685389b80893bb7 (diff) | |
| download | qbs-33d129352a2674fdc8fc8c26b826a78f10e5f7a6.tar.gz | |
freedesktop: Rename "name" property to "appName"
"name" is a built-in property of the Module item that must not be set by
users. Astonishingly, this has worked so far due to the way the
ModuleLoader code was written.
Change-Id: I959bc0bba6b7c17a420fc6201031ab0bf4449292
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| -rw-r--r-- | changelogs/changes-2.0.0.md | 3 | ||||
| -rw-r--r-- | doc/reference/modules/freedesktop-module.qdoc | 2 | ||||
| -rw-r--r-- | share/qbs/modules/freedesktop/FreeDesktop.qbs | 3 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/changelogs/changes-2.0.0.md b/changelogs/changes-2.0.0.md index 93a37ae7f..14cacb761 100644 --- a/changelogs/changes-2.0.0.md +++ b/changelogs/changes-2.0.0.md @@ -9,6 +9,9 @@ # BareMetal support * Added support for HPPA architectures +# Other modules +* Renamed "name" to "appName" in the freedesktop module to prevent clash with built-in property + # Infrastructure * Added USBSAN CI job diff --git a/doc/reference/modules/freedesktop-module.qdoc b/doc/reference/modules/freedesktop-module.qdoc index 6c9d4a7fa..5b6b14d0f 100644 --- a/doc/reference/modules/freedesktop-module.qdoc +++ b/doc/reference/modules/freedesktop-module.qdoc @@ -119,7 +119,7 @@ */ /*! - \qmlproperty string freedesktop::name + \qmlproperty string freedesktop::appName The display name of the application which will be stored in the \c{.desktop} file. diff --git a/share/qbs/modules/freedesktop/FreeDesktop.qbs b/share/qbs/modules/freedesktop/FreeDesktop.qbs index 5fe7ed72c..60722c674 100644 --- a/share/qbs/modules/freedesktop/FreeDesktop.qbs +++ b/share/qbs/modules/freedesktop/FreeDesktop.qbs @@ -34,13 +34,14 @@ import "freedesktop.js" as Fdo Module { property string name: product.name + property string appName: name property var desktopKeys readonly property var defaultDesktopKeys: { return { 'Type': 'Application', - 'Name': product.freedesktop.name, + 'Name': product.freedesktop.appName, 'Exec': product.targetName, 'Terminal': 'false', 'Version': '1.1', diff --git a/tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs b/tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs index b3519ba4c..1efe5c91c 100644 --- a/tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs +++ b/tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs @@ -10,7 +10,7 @@ Project { Depends { name: "freedesktop" } - freedesktop.name: "My App" + freedesktop.appName: "My App" freedesktop.desktopKeys: ({ 'Icon': "myapp.png" }) |