From f81724f45819ae6c08b8a9d0390b1eeadc9ce4df Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 19 Dec 2022 12:15:34 +0100 Subject: [PATCH] Debugger: Make android std dumpers refer to libcpp Amends af881688e5f. Change-Id: If207dd04e37e5f80f68b374fe66fd3beec330ead Reviewed-by: Reviewed-by: hjk --- share/qtcreator/debugger/android_stdtypes.py | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/share/qtcreator/debugger/android_stdtypes.py b/share/qtcreator/debugger/android_stdtypes.py index a7d1baa4446..b91762d7ab8 100644 --- a/share/qtcreator/debugger/android_stdtypes.py +++ b/share/qtcreator/debugger/android_stdtypes.py @@ -6,7 +6,7 @@ from dumper import DumperBase from utils import DisplayFormat import stdtypes -import mac_stdtypes +import libcpp_stdtypes def qform__std____ndk1__array(): @@ -26,11 +26,11 @@ def qdump__std____ndk1__deque(d, value): def qdump__std____ndk1__list(d, value): - return mac_stdtypes.qdump__std____1__list(d, value) + return libcpp_stdtypes.qdump__std____1__list(d, value) def qdump__std____ndk1__set(d, value): - return mac_stdtypes.qdump__std____1__set(d, value) + return libcpp_stdtypes.qdump__std____1__set(d, value) def qdump__std____ndk1__multiset(d, value): @@ -42,7 +42,7 @@ def qform__std____ndk1__map(): def qdump__std____ndk1__map(d, value): - return mac_stdtypes.qdump__std____1__map(d, value) + return libcpp_stdtypes.qdump__std____1__map(d, value) def qform__std____ndk1__multimap(): @@ -54,7 +54,7 @@ def qdump__std____ndk1__multimap(d, value): def qdump__std____ndk1__map__iterator(d, value): - return mac_stdtypes.qdump__std____1__map__iterator(d, value) + return libcpp_stdtypes.qdump__std____1__map__iterator(d, value) def qdump__std____ndk1__map__const_iterator(d, value): @@ -62,7 +62,7 @@ def qdump__std____ndk1__map__const_iterator(d, value): def qdump__std____ndk1__set__iterator(d, value): - return mac_stdtypes.qdump__std____1__set__iterator(d, value) + return libcpp_stdtypes.qdump__std____1__set__iterator(d, value) def qdump__std____ndk1__set_const_iterator(d, value): @@ -70,23 +70,23 @@ def qdump__std____ndk1__set_const_iterator(d, value): def qdump__std____ndk1__stack(d, value): - return mac_stdtypes.qdump__std____1__stack(d, value) + return libcpp_stdtypes.qdump__std____1__stack(d, value) def qdump__std____ndk1__string(d, value): - return mac_stdtypes.qdump__std____1__string(d, value) + return libcpp_stdtypes.qdump__std____1__string(d, value) def qdump__std____ndk1__wstring(d, value): - return mac_stdtypes.qdump__std____1__wstring(d, value) + return libcpp_stdtypes.qdump__std____1__wstring(d, value) def qdump__std____ndk1__basic_string(d, value): - return mac_stdtypes.qdump__std____1__basic_string(d, value) + return libcpp_stdtypes.qdump__std____1__basic_string(d, value) def qdump__std____ndk1__shared_ptr(d, value): - return mac_stdtypes.qdump__std____1__shared_ptr(d, value) + return libcpp_stdtypes.qdump__std____1__shared_ptr(d, value) def qdump__std____ndk1__weak_ptr(d, value): @@ -102,11 +102,11 @@ def qform__std____ndk1__unordered_map(): def qdump__std____ndk1__unordered_map(d, value): - mac_stdtypes.qdump__std____1__unordered_map(d, value) + libcpp_stdtypes.qdump__std____1__unordered_map(d, value) def qdump__std____ndk1__unordered_set(d, value): - return mac_stdtypes.qdump__std____1__unordered_set(d, value) + return libcpp_stdtypes.qdump__std____1__unordered_set(d, value) def qdump__std____ndk1__unordered_multiset(d, value): @@ -118,7 +118,7 @@ def qform__std____ndk1__valarray(): def qdump__std____ndk1__valarray(d, value): - return mac_stdtypes.qdump__std____1__valarray(d, value) + return libcpp_stdtypes.qdump__std____1__valarray(d, value) def qform__std____ndk1__vector():