diff options
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.cpp')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.cpp index 48830caee6..54ba6bed07 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.cpp @@ -108,7 +108,7 @@ void IconRenderer::setupRender() if (m_contentItem->height() > containerItem->height()) containerItem->setHeight(m_contentItem->height()); - QTimer::singleShot(0, this, [this, containerItem, is3D]() { + QTimer::singleShot(0, this, [this, is3D, containerItem]() { m_designerSupport.refFromEffectItem(m_quickView->rootObject(), false); QQuickDesignerSupportItems::disableNativeTextRendering(m_quickView->rootObject()); @@ -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); |