diff options
| author | hjk <qtc-committer@nokia.com> | 2011-10-13 11:41:37 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-10-17 10:26:45 +0200 |
| commit | 2c2b3732db464bdd951d8585e9c5d6ee11bb3ce2 (patch) | |
| tree | 67ccd247e2f742f824df2bb2edddf7cca37ad642 /share | |
| parent | e7c211f9ad5a78f12403a3e3ea01d0a3647bed11 (diff) | |
| download | qt-creator-2c2b3732db464bdd951d8585e9c5d6ee11bb3ce2.tar.gz | |
debugger: more robust Qt 4 vs Qt 5 detection in dumper
Change-Id: I2a1eb5181e614899f3cd80e0eaec5be9a3e93c77
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit f626168c629ed226811d6cfa80e4410fd99ebfba)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/dumper/dumper.py | 7 |
1 files 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 |