diff options
Diffstat (limited to 'share/qtcreator')
| -rw-r--r-- | share/qtcreator/debugger/gdbbridge.py | 3 | ||||
| -rw-r--r-- | share/qtcreator/debugger/qttypes.py | 15 | ||||
| -rw-r--r-- | share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml | 56 | ||||
| -rw-r--r-- | share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf | bin | 15012 -> 15516 bytes |
4 files changed, 34 insertions, 40 deletions
diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py index 5d32f8426c9..f5ee86c3497 100644 --- a/share/qtcreator/debugger/gdbbridge.py +++ b/share/qtcreator/debugger/gdbbridge.py @@ -1117,7 +1117,8 @@ class Dumper(DumperBase): self.qtCustomEventPltFunc = self.findSymbol(sym) sym = '_ZNK%s7QObject8propertyEPKc' % strns - self.qtPropertyFunc = self.findSymbol(sym) + if not self.isWindowsTarget(): # prevent calling the property function on windows + self.qtPropertyFunc = self.findSymbol(sym) def assignValue(self, args): typeName = self.hexdecode(args['type']) diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py index aa3e9ecc0c3..5fd48d816ca 100644 --- a/share/qtcreator/debugger/qttypes.py +++ b/share/qtcreator/debugger/qttypes.py @@ -1982,18 +1982,9 @@ def qdump__QVariant(d, value): if d.isExpanded(): innerType = None with Children(d): - ev = d.parseAndEvaluate - p = None - if p is None: - # Without debug info. - symbol = d.mangleName(d.qtNamespace() + 'QMetaType::typeName') + 'i' - p = ev('((const char *(*)(int))%s)(%d)' % (symbol, variantType)) - #if p is None: - # p = ev('((const char *(*)(int))%sQMetaType::typeName)(%d)' % (ns, variantType)) - if p is None: - # LLDB on Linux - p = ev('((const char *(*)(int))QMetaType::typeName)(%d)' % variantType) - if p is None: + try: + p = d.call('const char *', value, 'typeName') + except: d.putSpecialValue('notcallable') return None ptr = p.pointer() diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml index 928b8c4df74..d3fd86ca109 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml @@ -102,33 +102,35 @@ QtObject { readonly property string lockOn: "\u005F" readonly property string mergeCells: "\u0060" readonly property string minus: "\u0061" - readonly property string plus: "\u0062" - readonly property string redo: "\u0063" - readonly property string splitColumns: "\u0064" - readonly property string splitRows: "\u0065" - readonly property string startNode: "\u0066" - readonly property string testIcon: "\u0067" - readonly property string textAlignBottom: "\u0068" - readonly property string textAlignCenter: "\u0069" - readonly property string textAlignLeft: "\u006A" - readonly property string textAlignMiddle: "\u006B" - readonly property string textAlignRight: "\u006C" - readonly property string textAlignTop: "\u006D" - readonly property string textBulletList: "\u006E" - readonly property string textFullJustification: "\u006F" - readonly property string textNumberedList: "\u0070" - readonly property string tickIcon: "\u0071" - readonly property string triState: "\u0072" - readonly property string undo: "\u0073" - readonly property string upDownIcon: "\u0074" - readonly property string upDownSquare2: "\u0075" - readonly property string visibilityOff: "\u0076" - readonly property string visibilityOn: "\u0077" - readonly property string wildcard: "\u0078" - readonly property string zoomAll: "\u0079" - readonly property string zoomIn: "\u007A" - readonly property string zoomOut: "\u007B" - readonly property string zoomSelection: "\u007C" + readonly property string pin: "\u0062" + readonly property string plus: "\u0063" + readonly property string redo: "\u0064" + readonly property string splitColumns: "\u0065" + readonly property string splitRows: "\u0066" + readonly property string startNode: "\u0067" + readonly property string testIcon: "\u0068" + readonly property string textAlignBottom: "\u0069" + readonly property string textAlignCenter: "\u006A" + readonly property string textAlignLeft: "\u006B" + readonly property string textAlignMiddle: "\u006C" + readonly property string textAlignRight: "\u006D" + readonly property string textAlignTop: "\u006E" + readonly property string textBulletList: "\u006F" + readonly property string textFullJustification: "\u0070" + readonly property string textNumberedList: "\u0071" + readonly property string tickIcon: "\u0072" + readonly property string triState: "\u0073" + readonly property string undo: "\u0074" + readonly property string unpin: "\u0075" + readonly property string upDownIcon: "\u0076" + readonly property string upDownSquare2: "\u0077" + readonly property string visibilityOff: "\u0078" + readonly property string visibilityOn: "\u0079" + readonly property string wildcard: "\u007A" + readonly property string zoomAll: "\u007B" + readonly property string zoomIn: "\u007C" + readonly property string zoomOut: "\u007D" + readonly property string zoomSelection: "\u007E" readonly property font iconFont: Qt.font({ "family": controlIcons.name, diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf Binary files differindex b8addaf8351..a82278be111 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf |