From 2e1cca4bb6051067c031c4b9b248b99acd63369a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Thu, 21 Oct 2021 21:25:37 +0200 Subject: =?UTF-8?q?macdeployqt:=20don=E2=80=99t=20stop=20qmlimportscanner?= =?UTF-8?q?=20after=2030s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Process::waitForFinished() has a default timeout of 30 seconds, but qmlimportscanner can in some cases run for longer than that. Pick-to: 5.15 6.2 Fixes: QTBUG-97104 Change-Id: Ie40d052ad6a4dc8643860163eb9a0c8f5859c3ae Reviewed-by: Liang Qi --- src/macdeployqt/shared/shared.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index a61392cd7..af21caa50 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -1305,7 +1305,7 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf LogError() << "Could not start qmlimpoortscanner. Process error is" << qmlImportScanner.errorString(); return false; } - qmlImportScanner.waitForFinished(); + qmlImportScanner.waitForFinished(-1); // log qmlimportscanner errors qmlImportScanner.setReadChannel(QProcess::StandardError); -- cgit v1.2.3