feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Don't hard-fail on missing Python json module

Browse Source 
Only needed for native combined debugging.

Task-number: QTCREATORBUG-18577
Change-Id: I7c5d877b9601e77ab8de251305db829a07675f8d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-07-20 11:36:19 +02:00
parent 578de25d96
commit 1d682f2144
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
share/qtcreator/debugger/dumper.py
View File

@@ -32,10 +32,17 @@ import sys
import base64 import base64
import re import re
import time import time
import json
import inspect import inspect
import threading 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: if sys.version_info[0] >= 3:
xrange = range xrange = range
toInteger = int toInteger = int