forked from qt-creator/qt-creator
Process: Get rid of setTimeoutS()
Add an extra arg to runBlocking() function instead. Use std::chrono::seconds for timeout. Change-Id: I7c3c21e8f26a2ccbed157d15083d6ef0b4cd2f7e Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
@@ -215,10 +215,9 @@ static QByteArray decodeProvisioningProfile(const QString &path)
|
||||
QTC_ASSERT(!path.isEmpty(), return QByteArray());
|
||||
|
||||
Process p;
|
||||
p.setTimeoutS(3);
|
||||
// path is assumed to be valid file path to .mobileprovision
|
||||
p.setCommand({"openssl", {"smime", "-inform", "der", "-verify", "-in", path}});
|
||||
p.runBlocking();
|
||||
p.runBlocking(std::chrono::seconds(3));
|
||||
if (p.result() != ProcessResult::FinishedWithSuccess)
|
||||
qCDebug(iosCommonLog) << "Reading signed provisioning file failed" << path;
|
||||
return p.cleanedStdOut().toLatin1();
|
||||
|
||||
@@ -41,9 +41,8 @@ void XcodeProbe::addDeveloperPath(const QString &path)
|
||||
void XcodeProbe::detectDeveloperPaths()
|
||||
{
|
||||
Utils::Process selectedXcode;
|
||||
selectedXcode.setTimeoutS(5);
|
||||
selectedXcode.setCommand({"/usr/bin/xcode-select", {"--print-path"}});
|
||||
selectedXcode.runBlocking();
|
||||
selectedXcode.runBlocking(std::chrono::seconds(5));
|
||||
if (selectedXcode.result() != ProcessResult::FinishedWithSuccess)
|
||||
qCWarning(probeLog)
|
||||
<< QString::fromLatin1("Could not detect selected Xcode using xcode-select");
|
||||
|
||||
Reference in New Issue
Block a user