diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2021-10-21 21:25:37 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2021-10-22 12:14:26 +0000 |
| commit | 2e1cca4bb6051067c031c4b9b248b99acd63369a (patch) | |
| tree | 8773d1f953dd7f3694a8f7ce5e5376ef0daa7ca9 /src/macdeployqt/shared/shared.cpp | |
| parent | 52538a9d3d1ba10c638441666f8efbc78ba0b347 (diff) | |
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.
Pick-to: 5.15 6.2
Fixes: QTBUG-97104
Change-Id: Ie40d052ad6a4dc8643860163eb9a0c8f5859c3ae
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/macdeployqt/shared/shared.cpp')
| -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 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); |