diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2024-01-22 18:59:10 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2024-01-23 07:09:22 +0000 |
| commit | 63fc22e274d98f7e51a3f9f5335bbd4a31636c2f (patch) | |
| tree | b4486531dae624f1184534d40dc254dbf07c5ab4 /src/plugins/qbsprojectmanager | |
| parent | f86ada790a8b8936c4505acb7733ebd686ce2a41 (diff) | |
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>
Diffstat (limited to 'src/plugins/qbsprojectmanager')
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsprofilemanager.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbssession.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbssettings.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp b/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp index dc04e29b261..b761b726674 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp +++ b/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp @@ -229,7 +229,7 @@ QString QbsProfileManager::runQbsConfig(QbsConfigOp op, const QString &key, cons Utils::Process qbsConfig; qbsConfig.setCommand({qbsConfigExe, args}); qbsConfig.start(); - if (!qbsConfig.waitForFinished(5000)) { + if (!qbsConfig.waitForFinished(std::chrono::seconds(5))) { Core::MessageManager::writeFlashing( Tr::tr("Failed to run qbs config: %1").arg(qbsConfig.errorString())); } else if (qbsConfig.exitCode() != 0) { diff --git a/src/plugins/qbsprojectmanager/qbssession.cpp b/src/plugins/qbsprojectmanager/qbssession.cpp index bde6f907f92..c3e397e3cfa 100644 --- a/src/plugins/qbsprojectmanager/qbssession.cpp +++ b/src/plugins/qbsprojectmanager/qbssession.cpp @@ -215,7 +215,7 @@ QbsSession::~QbsSession() d->qbsProcess->disconnect(this); if (d->qbsProcess->state() == QProcess::Running) { sendQuitPacket(); - d->qbsProcess->waitForFinished(10000); + d->qbsProcess->waitForFinished(std::chrono::seconds(10)); } delete d->qbsProcess; } diff --git a/src/plugins/qbsprojectmanager/qbssettings.cpp b/src/plugins/qbsprojectmanager/qbssettings.cpp index 147a1037fd6..9beb57c6920 100644 --- a/src/plugins/qbsprojectmanager/qbssettings.cpp +++ b/src/plugins/qbsprojectmanager/qbssettings.cpp @@ -35,7 +35,7 @@ static QString getQbsVersion(const FilePath &qbsExe) Process qbsProc; qbsProc.setCommand({qbsExe, {"--version"}}); qbsProc.start(); - if (!qbsProc.waitForFinished(5000) || qbsProc.exitCode() != 0) + if (!qbsProc.waitForFinished(std::chrono::seconds(5)) || qbsProc.exitCode() != 0) return {}; return QString::fromLocal8Bit(qbsProc.rawStdOut()).trimmed(); } |