diff options
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/debugger/cdbbridge.py | 11 | ||||
| -rw-r--r-- | share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json | 8 |
2 files changed, 16 insertions, 3 deletions
diff --git a/share/qtcreator/debugger/cdbbridge.py b/share/qtcreator/debugger/cdbbridge.py index 00a91306419..4e421c2ada0 100644 --- a/share/qtcreator/debugger/cdbbridge.py +++ b/share/qtcreator/debugger/cdbbridge.py @@ -93,6 +93,11 @@ class Dumper(DumperBase): self.outputLock = threading.Lock() self.isCdb = True + def enumValue(self, nativeValue): + val = nativeValue.nativeDebuggerValue() + # remove '0n' decimal prefix of the native cdb value output + return val.replace('(0n', '(') + def fromNativeValue(self, nativeValue): self.check(isinstance(nativeValue, cdbext.Value)) val = self.Value(self) @@ -123,6 +128,8 @@ class Dumper(DumperBase): except: # read raw memory in case the integerString can not be interpreted pass + if val.type.code == TypeCodeEnum: + val.ldisplay = self.enumValue(nativeValue) val.isBaseClass = val.name == val.type.name val.nativeValue = nativeValue val.laddress = nativeValue.address() @@ -212,9 +219,7 @@ class Dumper(DumperBase): value = cdbext.createValue(addr, nativeType) if value is None: return '' - enumDisplay = value.nativeDebuggerValue() - # remove '0n' decimal prefix of the native cdb value output - return enumDisplay.replace('(0n', '(') + return enumDisplay(value) def enumExpression(self, enumType, enumValue): ns = self.qtNamespace() diff --git a/share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json b/share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json index 84509537cfa..12683dc1af2 100644 --- a/share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json +++ b/share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json @@ -81,12 +81,16 @@ "QtQuick.Controls 2.0", "QtQuick.Controls 2.1", "QtQuick.Controls 2.2", + "QtQuick.Controls 2.3", + "QtQuick.Controls 2.4", "QtQuick.Controls.Material 2.0", "QtQuick.Controls.Material 2.1", "QtQuick.Controls.Material 2.2", + "QtQuick.Controls.Material 2.3", "QtQuick.Controls.Universal 2.0", "QtQuick.Controls.Universal 2.1", "QtQuick.Controls.Universal 2.2", + "QtQuick.Controls.Universal 2.3", "QtQuick.Controls.Styles 1.0", "QtQuick.Controls.Styles 1.1", "QtQuick.Controls.Styles 1.2", @@ -109,6 +113,8 @@ "QtQuick.Window 2.1", "QtQuick.Window 2.2", "QtQuick.Window 2.3", + "QtQuick.Window 2.10", + "QtQuick.Window 2.11", "QtQuick.XmlListModel 2.0", "QtSensors 5.0", "QtSensors 5.1", @@ -130,6 +136,8 @@ "QtQuick 2.7", "QtQuick 2.8", "QtQuick 2.9", + "QtQuick 2.10", + "QtQuick 2.11", "QtTest 1.0", "QtWebEngine 1.0", "QtWebEngine 1.1", |