From 7c186422444458f30ec7f7e59060c900e845536b Mon Sep 17 00:00:00 2001 From: Juha Vuolle Date: Mon, 13 Feb 2023 12:34:57 +0200 Subject: Adjust permissions.prf plist path handling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Pick-to: 6.5 Change-Id: I27c7f1e7044a55ff7fbd78ef1dd79c92b17e8018 Reviewed-by: Tor Arne Vestbø --- mkspecs/features/permissions.prf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mkspecs') 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): \ -- cgit v1.2.3