diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2021-10-21 21:25:37 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-10-22 13:35:05 +0000 |
| commit | 8c30683bd5a499d633d34124c6815df060fa44c3 (patch) | |
| tree | 770da45ae8607bbd536fbb6e40678e545b921bc3 | |
| parent | 7cfa4ae59f4165441cac07f8ec08f791260b1887 (diff) | |
| download | qttools-8c30683bd5a499d633d34124c6815df060fa44c3.tar.gz | |
macdeployqt: don’t stop qmlimportscanner after 30s
Process::waitForFinished() has a default timeout of
30 seconds, but qmlimportscanner can in some cases
run for longer than that.
Fixes: QTBUG-97104
Change-Id: Ie40d052ad6a4dc8643860163eb9a0c8f5859c3ae
Reviewed-by: Liang Qi <liang.qi@qt.io>
(cherry picked from commit 2e1cca4bb6051067c031c4b9b248b99acd63369a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/macdeployqt/shared/shared.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index 0825510a0..3070c372e 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -1297,7 +1297,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); |