From f626168c629ed226811d6cfa80e4410fd99ebfba Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 13 Oct 2011 11:41:37 +0200 Subject: [PATCH] debugger: more robust Qt 4 vs Qt 5 detection in dumper Change-Id: I2a1eb5181e614899f3cd80e0eaec5be9a3e93c77 Reviewed-by: hjk --- share/qtcreator/dumper/dumper.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/share/qtcreator/dumper/dumper.py b/share/qtcreator/dumper/dumper.py index 0f4056ae39..60fbd7049f 100644 --- a/share/qtcreator/dumper/dumper.py +++ b/share/qtcreator/dumper/dumper.py @@ -587,8 +587,11 @@ def qtMajorVersion(): return qqMajorVersion try: # -- Result is returned as character, need to subtract '0' - qqMajorVersion = int(parseAndEvaluate(qtNamespace() + "qVersion()[0]")) - 48 - return qqMajorVersion + v = int(parseAndEvaluate("*(char*)qVersion()")) + if v >= 51: + qqMajorVersion = v - 48 + return qqMajorVersion + return 0 except: return 0 -- 2.11.0