diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2025-07-23 13:22:03 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2025-08-19 16:53:17 +0200 |
| commit | 9de2e727d9511e6e740983ed20002caeae9a705f (patch) | |
| tree | b4b7a74cf8b951836934d1c71d849d238e261ea9 /src/tools/windeployqt/qmlutils.cpp | |
| parent | de9df1b3d507ec511847c404177b08790ff6a6d7 (diff) | |
windeployqt: Add parameter to extend timeout of qmlimportscanner
In big projects it is possible that the default timeout for running
qmlimportscanner (30 seconds) is not enough. Give the user the option to
extend that value.
[ChangeLog][Tools][Windeployqt] Add option to control timeout for
qmlimportscanner runs.
Pick-to: 6.10 6.9 6.8
Fixes: QTBUG-138395
Change-Id: I5c9534bd141ec6fcb66d4e990e46cd2dfcef2647
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/tools/windeployqt/qmlutils.cpp')
| -rw-r--r-- | src/tools/windeployqt/qmlutils.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/windeployqt/qmlutils.cpp b/src/tools/windeployqt/qmlutils.cpp index a7e63e74705..0f7c13653a7 100644 --- a/src/tools/windeployqt/qmlutils.cpp +++ b/src/tools/windeployqt/qmlutils.cpp @@ -75,7 +75,7 @@ static void findFileRecursion(const QDir &directory, Platform platform, QmlImportScanResult runQmlImportScanner(const QString &directory, const QStringList &qmlImportPaths, bool usesWidgets, int platform, DebugMatchMode debugMatchMode, - QString *errorMessage) + QString *errorMessage, int timeout) { Q_UNUSED(usesWidgets); QmlImportScanResult result; @@ -87,7 +87,8 @@ QmlImportScanResult runQmlImportScanner(const QString &directory, const QStringL QByteArray stdOut; QByteArray stdErr; const QString binary = QStringLiteral("qmlimportscanner"); - if (!runProcess(binary, arguments, QDir::currentPath(), &exitCode, &stdOut, &stdErr, errorMessage)) + if (!runProcess(binary, arguments, QDir::currentPath(), &exitCode, &stdOut, &stdErr, + errorMessage, timeout)) return result; if (exitCode) { *errorMessage = binary + QStringLiteral(" returned ") + QString::number(exitCode) |