diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-06-14 12:07:38 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-06-14 11:40:27 +0000 |
commit | a838fd23288370e4e9898b30d9b57803d93a6597 (patch) | |
tree | b87c5d381a8a3cec0dfc3ef4edfabb44fb099406 /src/app | |
parent | a666dedaad7d63d758f57f6e58ca285f80b5f0cd (diff) |
Call QProcess::waitForFinished with timeout of -1
The default value of 30 s can be too short for environments like
virtual machines under heavy load.
Task-number: QBS-1360
Change-Id: I83af7740dc842faf8795f5901f36744229160154
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/app')
-rw-r--r-- | src/app/qbs-setup-toolchains/xcodeprobe.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/app/qbs-setup-toolchains/xcodeprobe.cpp b/src/app/qbs-setup-toolchains/xcodeprobe.cpp index 857a3d231..2cb54f5b9 100644 --- a/src/app/qbs-setup-toolchains/xcodeprobe.cpp +++ b/src/app/qbs-setup-toolchains/xcodeprobe.cpp @@ -102,7 +102,7 @@ void XcodeProbe::detectDeveloperPaths() QString program = QLatin1String("/usr/bin/xcode-select"); QStringList arguments(QLatin1String("--print-path")); selectedXcode.start(program, arguments, QProcess::ReadOnly); - if (!selectedXcode.waitForFinished() || selectedXcode.exitCode()) { + if (!selectedXcode.waitForFinished(-1) || selectedXcode.exitCode()) { qbsInfo() << Tr::tr("Could not detect selected Xcode with /usr/bin/xcode-select"); } else { QString path = QString::fromLocal8Bit(selectedXcode.readAllStandardOutput()); @@ -114,7 +114,7 @@ void XcodeProbe::detectDeveloperPaths() program = QLatin1String("/usr/bin/mdfind"); arguments = QStringList(QLatin1String("kMDItemCFBundleIdentifier == 'com.apple.dt.Xcode'")); launchServices.start(program, arguments, QProcess::ReadOnly); - if (!launchServices.waitForFinished() || launchServices.exitCode()) { + if (!launchServices.waitForFinished(-1) || launchServices.exitCode()) { qbsInfo() << Tr::tr("Could not detect additional Xcode installations with /usr/bin/mdfind"); } else { for (const QString &path : QString::fromLocal8Bit(launchServices.readAllStandardOutput()) |