From 82133aa5f11a3ca4f2a58a5029de29ee3bbf4cec Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 21 Jun 2013 15:10:40 +0200 Subject: [PATCH] Debugger: Mork workarounds for LLDB enum lookup issue Change-Id: I236e2d5195ea0f9813fe7ebaa7dc2434579abbe5 Reviewed-by: hjk --- share/qtcreator/dumper/qttypes.py | 34 +++++++++++++++++-------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/share/qtcreator/dumper/qttypes.py b/share/qtcreator/dumper/qttypes.py index 44cbc4f667..b7defb1e43 100644 --- a/share/qtcreator/dumper/qttypes.py +++ b/share/qtcreator/dumper/qttypes.py @@ -337,17 +337,19 @@ def qdump__QTime(d, value): d.putValue(value["mds"], MillisecondsSinceMidnight) d.putNumChild(1) if d.isExpanded(): - qt = d.ns + "Qt::" + qtdate = d.ns + "Qt::" + qttime = d.ns + "Qt::" if lldbLoaded: - qt += "DateFormat::" # FIXME: Bug?... + qtdate += "DateFormat::" # FIXME: Bug?... + qttime += "TimeSpec::" # FIXME: This improperly uses complex return values. with Children(d): - d.putCallItem("toString", value, "toString", qt + "TextDate") - d.putCallItem("(ISO)", value, "toString", qt + "ISODate") + d.putCallItem("toString", value, "toString", qtdate + "TextDate") + d.putCallItem("(ISO)", value, "toString", qtdate + "ISODate") d.putCallItem("(SystemLocale)", value, "toString", - qt + "SystemLocaleDate") - d.putCallItem("(Locale)", value, "toString", qt + "LocaleDate") - d.putCallItem("toUTC", value, "toTimeSpec", qt + "UTC") + qtdate + "SystemLocaleDate") + d.putCallItem("(Locale)", value, "toString", qtdate + "LocaleDate") + d.putCallItem("toUTC", value, "toTimeSpec", qttime + "UTC") else: d.putValue("(invalid)") d.putNumChild(0) @@ -368,16 +370,18 @@ def qdump__QDateTime(d, value): if d.isExpanded(): # FIXME: This improperly uses complex return values. with Children(d): - qt = d.ns + "Qt::" + qtdate = d.ns + "Qt::" + qttime = d.ns + "Qt::" if lldbLoaded: - qt += "DateFormat::" # FIXME: Bug?... + qtdate += "DateFormat::" # FIXME: Bug?... + qttime += "TimeSpec::" # FIXME: Bug?... d.putCallItem("toTime_t", value, "toTime_t") - d.putCallItem("toString", value, "toString", qt + "TextDate") - d.putCallItem("(ISO)", value, "toString", qt + "ISODate") - d.putCallItem("(SystemLocale)", value, "toString", qt + "SystemLocaleDate") - d.putCallItem("(Locale)", value, "toString", qt + "LocaleDate") - d.putCallItem("toUTC", value, "toTimeSpec", qt + "UTC") - d.putCallItem("toLocalTime", value, "toTimeSpec", qt + "LocalTime") + d.putCallItem("toString", value, "toString", qtdate + "TextDate") + d.putCallItem("(ISO)", value, "toString", qtdate + "ISODate") + d.putCallItem("(SystemLocale)", value, "toString", qtdate + "SystemLocaleDate") + d.putCallItem("(Locale)", value, "toString", qtdate + "LocaleDate") + d.putCallItem("toUTC", value, "toTimeSpec", qttime + "UTC") + d.putCallItem("toLocalTime", value, "toTimeSpec", qttime + "LocalTime") else: d.putValue("(invalid)") d.putNumChild(0) -- GitLab