diff options
| author | hjk <hjk@qt.io> | 2017-07-20 11:36:19 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2017-07-20 11:23:32 +0000 |
| commit | 1d682f214426b97360fc7433530c405b8d6a572c (patch) | |
| tree | 9a693a7687159420f1e5f28178c7196ec72fffbc /share | |
| parent | 578de25d9679d372f4f78ac9373d31e2462bc57b (diff) | |
| download | qt-creator-1d682f214426b97360fc7433530c405b8d6a572c.tar.gz | |
Debugger: Don't hard-fail on missing Python json module
Only needed for native combined debugging.
Task-number: QTCREATORBUG-18577
Change-Id: I7c5d877b9601e77ab8de251305db829a07675f8d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'share')
| -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 564b87a799..7314ec8b97 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 |