From 1d682f214426b97360fc7433530c405b8d6a572c Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 20 Jul 2017 11:36:19 +0200
Subject: [PATCH] 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>
---
 share/qtcreator/debugger/dumper.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py
index 564b87a7992..7314ec8b978 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