diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h index 62efb225d44..d6e30746661 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h +++ b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index 1db2bc3cb6a..bd6102243fd 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -2035,14 +2035,12 @@ void NodeInstanceView::handleQsbProcessExit(Utils::QtcProcess *qsbProcess, const { --m_remainingQsbTargets; - QString errStr = qsbProcess->errorString(); - QByteArray stdErrStr = qsbProcess->readAllStandardError(); + const QString errStr = qsbProcess->errorString(); + const QByteArray stdErrStr = qsbProcess->readAllStandardError(); if (!errStr.isEmpty() || !stdErrStr.isEmpty()) { - Core::MessageManager::writeSilently( - QCoreApplication::translate("QmlDesigner::NodeInstanceView", - "Failed to generate QSB file for: %1") - .arg(shader)); + Core::MessageManager::writeSilently(QCoreApplication::translate( + "QmlDesigner::NodeInstanceView", "Failed to generate QSB file for: %1").arg(shader)); if (!errStr.isEmpty()) Core::MessageManager::writeSilently(errStr); if (!stdErrStr.isEmpty()) @@ -2138,26 +2136,12 @@ void NodeInstanceView::handleShaderChanges() args.append(outPath.toString()); args.append(shader); auto qsbProcess = new Utils::QtcProcess; + connect(qsbProcess, &Utils::QtcProcess::done, this, [this, qsbProcess, shader] { + handleQsbProcessExit(qsbProcess, shader); + }); qsbProcess->setWorkingDirectory(srcPath); qsbProcess->setCommand({m_qsbPath, args}); qsbProcess->start(); - - if (!qsbProcess->waitForStarted()) { - handleQsbProcessExit(qsbProcess, shader); - continue; - } - - if (qsbProcess->state() == QProcess::Running) { - connect(qsbProcess, &Utils::QtcProcess::finished, - [thisView = QPointer(this), qsbProcess, shader]() { - if (thisView) - thisView->handleQsbProcessExit(qsbProcess, shader); - else - qsbProcess->deleteLater(); - }); - } else { - handleQsbProcessExit(qsbProcess, shader); - } } }