From a9426e1977f2358cba5446004fb6499fd7959ed0 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 27 Jun 2024 15:44:38 +0300 Subject: [PATCH] QmlDesigner: Fix puppet crash when importing asset with commas in name Importing 3D assets doesn't need to create Qt5NodeInstanceClientProxy, so skip that in puppet initialization as it may lead to misinterpreting some command line parameters given to the puppet. Fixes: QDS-13123 Change-Id: Ifa6601dfa7da1a613b2c897a287a7baeb07dd712 Reviewed-by: Mahmoud Badri --- src/tools/qml2puppet/qml2puppet/qmlpuppet.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tools/qml2puppet/qml2puppet/qmlpuppet.cpp b/src/tools/qml2puppet/qml2puppet/qmlpuppet.cpp index 332def504ee..345e2c4cf74 100644 --- a/src/tools/qml2puppet/qml2puppet/qmlpuppet.cpp +++ b/src/tools/qml2puppet/qml2puppet/qmlpuppet.cpp @@ -124,13 +124,13 @@ void QmlPuppet::initQmlRunner() QString options = m_coreApp->arguments().at(4); Import3D::import3D(sourceAsset, outDir, options); + } else { + startCrashpad(QCoreApplication::applicationDirPath() + + '/' + RELATIVE_LIBEXEC_PATH, crashReportsPath()); + + new QmlDesigner::Qt5NodeInstanceClientProxy(m_coreApp.get()); } - startCrashpad(QCoreApplication::applicationDirPath() - + '/' + RELATIVE_LIBEXEC_PATH, crashReportsPath()); - - new QmlDesigner::Qt5NodeInstanceClientProxy(m_coreApp.get()); - #if defined(Q_OS_WIN) && defined(QT_NO_DEBUG) SetErrorMode(SEM_NOGPFAULTERRORBOX); //We do not want to see any message boxes #endif