diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-07-21 10:08:05 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-07-21 10:08:05 +0200 |
| commit | 1feb5c604d6dea4501279c22a2be51d0d900dd61 (patch) | |
| tree | 349334e619938f9b8b5cb4e15a6d7d6e88b1f6be /share/qtcreator/debugger/dumper.py | |
| parent | 13d3a7a5dc5d8919bf8f8b1172892bd7f39b9fb1 (diff) | |
| parent | e65d4c6f655b7d2045d5b40b7a0e981901ba43b7 (diff) | |
| download | qt-creator-1feb5c604d6dea4501279c22a2be51d0d900dd61.tar.gz | |
Merge remote-tracking branch 'origin/4.4'
Change-Id: I02e54f45d233b89ddaee9c87da9b9af2a56374b8
Diffstat (limited to 'share/qtcreator/debugger/dumper.py')
| -rw-r--r-- | share/qtcreator/debugger/dumper.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py index bed8af8724..1a332ab3e1 100644 --- a/share/qtcreator/debugger/dumper.py +++ b/share/qtcreator/debugger/dumper.py @@ -32,10 +32,17 @@ import sys import base64 import re import time -import json import inspect import threading +try: + # That's only used in native combined debugging right now, so + # we do not need to hard fail in cases of partial python installation + # that will never use this. + import json +except: + pass + if sys.version_info[0] >= 3: xrange = range toInteger = int |