diff options
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/debugger/dumper.py | 3 | ||||
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/mockfiles/IconRenderer3D.qml | 11 | ||||
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.cpp | 7 |
3 files changed, 9 insertions, 12 deletions
diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py index f8db816729..5e211885ce 100644 --- a/share/qtcreator/debugger/dumper.py +++ b/share/qtcreator/debugger/dumper.py @@ -1336,7 +1336,10 @@ class DumperBase(): return displayFormat = self.currentItemFormat(value.type.name) + innerType = value.type.target() # .unqualified() + if innerType.code == TypeCode.Typedef: + innerType = innerType.ltarget if innerType.name == 'void': #DumperBase.warn('VOID POINTER: %s' % displayFormat) diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/IconRenderer3D.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/IconRenderer3D.qml index afaf8481ca..99c20047a4 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/IconRenderer3D.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/IconRenderer3D.qml @@ -40,20 +40,15 @@ Item { selectionBox.targetNode = view3D.importScene; } - function fitAndHideBox() : bool + function fitAndHideBox() { cameraControl.focusObject(selectionBox.model, viewCamera.eulerRotation, true, true); - if (cameraControl._zoomFactor < 0.1) { + if (cameraControl._zoomFactor < 0.1) view3D.importScene.scale = view3D.importScene.scale.times(10); - return false; - } - if (cameraControl._zoomFactor > 100) { + if (cameraControl._zoomFactor > 100) view3D.importScene.scale = view3D.importScene.scale.times(0.1); - return false; - } selectionBox.visible = false; - return true } View3D { diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.cpp index 9f9b7736d7..54ba6bed07 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.cpp @@ -117,17 +117,16 @@ void IconRenderer::setupRender() // Render once to make sure scene is up to date before we set up the selection box render({}); QMetaObject::invokeMethod(containerItem, "setSceneToBox"); - bool success = false; int tries = 0; - while (!success && tries < 10) { + while (tries < 10) { ++tries; render({}); - QMetaObject::invokeMethod(containerItem, "fitAndHideBox", - Q_RETURN_ARG(bool, success)); + QMetaObject::invokeMethod(containerItem, "fitAndHideBox"); } } #else Q_UNUSED(is3D) + Q_UNUSED(containerItem) #endif QFileInfo fi(m_filePath); |