forked from qt-creator/qt-creator
Process: Change signature of waitForXxx() functions
Change the arg to QDeadlineTimer type. Change-Id: Id3dee0717e44130c16baf7925e5b06346a1a1ad1 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
@@ -14,7 +14,6 @@
|
||||
#include <CoreFoundation/CoreFoundation.h>
|
||||
#endif
|
||||
|
||||
#include <chrono>
|
||||
#include <memory>
|
||||
|
||||
#include <QJsonArray>
|
||||
@@ -23,7 +22,9 @@
|
||||
#include <QLoggingCategory>
|
||||
|
||||
using namespace Utils;
|
||||
|
||||
using namespace std;
|
||||
using namespace std::chrono;
|
||||
|
||||
namespace {
|
||||
static Q_LOGGING_CATEGORY(simulatorLog, "qtc.ios.simulator", QtWarningMsg)
|
||||
@@ -31,7 +32,7 @@ static Q_LOGGING_CATEGORY(simulatorLog, "qtc.ios.simulator", QtWarningMsg)
|
||||
|
||||
namespace Ios::Internal {
|
||||
|
||||
const std::chrono::seconds simulatorStartTimeout = std::chrono::seconds(60);
|
||||
const seconds simulatorStartTimeout = seconds(60);
|
||||
|
||||
// simctl Json Tags and tokens.
|
||||
const char deviceTypeTag[] = "devicetypes";
|
||||
@@ -61,7 +62,7 @@ static expected_str<void> runCommand(
|
||||
return make_unexpected(Tr::tr("Failed to start process."));
|
||||
|
||||
forever {
|
||||
if (shouldStop() || p.waitForFinished(1000))
|
||||
if (shouldStop() || p.waitForFinished(seconds(1)))
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user