diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/IconRenderer3D.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/IconRenderer3D.qml index afaf8481ca6..99c20047a46 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 9f9b7736d7b..54ba6bed07c 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);