1 files changed, 23 insertions, 19 deletions
diff --git a/src/corelib/debug_script.py b/src/corelib/debug_script.py
index f6207c6104..b4a58530da 100644
--- a/src/corelib/debug_script.py
+++ b/src/corelib/debug_script.py
@@ -34,10 +34,6 @@ def import_bridge(path, debugger, session_dict, reload_module=False):
 
     return bridge
 
-def report_success(bridge):
-    print("Using Qt summary providers from Creator {} in '{}'".format(
-          bridge.CREATOR_VERSION, bridge.CREATOR_PATH))
-
 def __lldb_init_module(debugger, session_dict):
     # Check if the module has already been imported globally. This ensures
     # that the Qt Creator application search is only performed once per
@@ -48,28 +44,36 @@ def __lldb_init_module(debugger, session_dict):
         bridge = import_bridge(module.__file__, debugger, session_dict,
             reload_module = True)
         if bridge:
-            report_success(bridge)
             return
 
     versions = {}
-    for install in os.popen(
-        'mdfind kMDItemCFBundleIdentifier=org.qt-project.qtcreator'
-            '| while read p;'
-                'do echo $p=$(mdls "$p" -name kMDItemVersion -raw);'
-            'done'):
-        install = install.strip()
-        (p, v) = install.split('=')
-        versions[v] = p
+    for path in os.popen('mdfind kMDItemCFBundleIdentifier=org.qt-project.qtcreator'):
+        path = path.strip()
+        file = open(os.path.join(path, 'Contents', 'Info.plist'), "rb")
+
+        import plistlib
+        plist = plistlib.load(file)
+
+        version = None
+        for key in ["CFBundleVersion", "CFBundleShortVersionString"]:
+            if key in plist:
+                version = plist[key]
+                break
+
+        if not version:
+            print(f"Could not resolve version for '{path}'. Ignoring.")
+            continue
+
+        versions[version] = path
+
+    if not len(versions):
+        print("Could not find Qt Creator installation. No Qt summary providers installed.")
+        return
 
     for version in sorted(versions, key=LooseVersion, reverse=True):
         path = versions[version]
-
+        print(f"Loading Qt summary providers from Creator {version} in '{path}'")
         bridge_path = '{}/Contents/Resources/debugger/lldbbridge.py'.format(path)
         bridge = import_bridge(bridge_path, debugger, session_dict)
         if bridge:
-            bridge.CREATOR_VERSION = version
-            bridge.CREATOR_PATH = path
-            report_success(bridge)
             return
-
-    print("Could not find Qt Creator installation, no Qt summary providers installed")