diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-15 09:56:54 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-15 09:56:54 +0200 |
| commit | a46c03c0737ce5e2e5b231e448e3fc112ef1fc59 (patch) | |
| tree | 77f8bc134b8eb4515947d219af4095c2865767cc /src/app | |
| parent | 9788db406f1a3317e3904cb910eab4d518d9cf8b (diff) | |
| parent | d994e54712efb69225d73d93fc57b89a3d39cacb (diff) | |
Merge 1.12 into master
Change-Id: I72bbda4537a65bc525afc38a3d280f3c23940c12
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()) |