diff options
| author | Juha Vuolle <juha.vuolle@qt.io> | 2023-02-13 12:34:57 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-13 13:42:00 +0000 |
| commit | 5efec4016c18219f119ba7c9523a04c513b6887f (patch) | |
| tree | dfffa698703607ef5e1a3b37fd7bc8711b4c1632 /mkspecs | |
| parent | d656fde77ee22d0c16724f1295124b099e69f3c4 (diff) | |
Adjust permissions.prf plist path handling
Few tweaks:
- Remove extra closing parenthesis
- Use absolute paths as the exists() checks & other plist path
uses are relative to the permissions.prf location
- Use the plist path with PlistBuddy instead of the variable
from .pro file
Change-Id: I27c7f1e7044a55ff7fbd78ef1dd79c92b17e8018
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 7c186422444458f30ec7f7e59060c900e845536b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/permissions.prf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/features/permissions.prf b/mkspecs/features/permissions.prf index 9f11d3c4bd..ac5f2cb108 100644 --- a/mkspecs/features/permissions.prf +++ b/mkspecs/features/permissions.prf @@ -2,7 +2,8 @@ isEmpty(QMAKE_INFO_PLIST): \ return() -plist_path = $$relative_path($$absolute_path($$QMAKE_INFO_PLIST, $$_PRO_FILE_PWD_), $$OUT_PWD)) +plist_path = $$absolute_path($$QMAKE_INFO_PLIST, $$_PRO_FILE_PWD_) + !exists($$plist_path): \ return() @@ -15,7 +16,7 @@ for(plugin, QT_PLUGINS) { found_usage_description = false for(usage_description_key, usage_descriptions) { usage_description = $$system("/usr/libexec/PlistBuddy" \ - "-c 'print $$usage_description_key' $$QMAKE_INFO_PLIST 2>/dev/null", \ + "-c 'print $$usage_description_key' $$plist_path 2>/dev/null", \ singleLine, exit_code) !equals(exit_code, 0): \ |