diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2020-05-27 18:59:53 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-05-27 18:59:53 +0200 |
| commit | b193892fd1289bd8a995cd609ead33f925b75ee1 (patch) | |
| tree | 4d03bf8ea45a9ab542eb6ab129e56a82b860e19c /share | |
| parent | aa79d30b83fc79e8e18af4da0062ddf21fcd201f (diff) | |
| parent | 13ad8163080153cb5d1ea39238069b5cca8f9651 (diff) | |
Merge remote-tracking branch 'origin/4.12' into qds-1.50qds-1.50
Change-Id: I8e4155aa2a0a8c7f7405dd79e856380011e23a33
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/android/sdk_definitions.json | 4 | ||||
| -rw-r--r-- | share/qtcreator/debugger/dumper.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/share/qtcreator/android/sdk_definitions.json b/share/qtcreator/android/sdk_definitions.json index 7bce8d6658..c88926b873 100644 --- a/share/qtcreator/android/sdk_definitions.json +++ b/share/qtcreator/android/sdk_definitions.json @@ -18,8 +18,8 @@ "specific_qt_versions": [ { "versions": ["default"], - "sdk_essential_packages": ["build-tools;29.0.2", "ndk-bundle"], - "ndk_path": "ndk-bundle" + "sdk_essential_packages": ["build-tools;29.0.2", "ndk;21.1.6352462"], + "ndk_path": "ndk/21.1.6352462" }, { "versions": ["5.12.[0-5]", "5.13.[0-1]"], diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py index 80d8d47fee..7df90b65db 100644 --- a/share/qtcreator/debugger/dumper.py +++ b/share/qtcreator/debugger/dumper.py @@ -39,7 +39,7 @@ try: # we do not need to hard fail in cases of partial python installation # that will never use this. import json -except ModuleNotFoundError: +except: print("Python module json not found. " "Native combined debugging might not work.") pass |