diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-11-25 11:25:34 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-11-25 11:25:34 +0100 |
| commit | 8245523653896e14af588fb2585d5cd76b7f4ba5 (patch) | |
| tree | b67c406590b6e5ce81414f775d9f2f03ab4b802b /src/plugins/updateinfo | |
| parent | 02c876f6e8f3bc26d03a7610901e72568d377a77 (diff) | |
| parent | edef529df6156bfd0461ca91371cabc948d5f34a (diff) | |
Merge remote-tracking branch 'origin/4.14'
Conflicts:
src/plugins/designer/cpp/formclasswizard.h
src/plugins/designer/cpp/formclasswizarddialog.h
Change-Id: I9f9d166e1a9249022305503f9cbe571136c2a2b1
Diffstat (limited to 'src/plugins/updateinfo')
| -rw-r--r-- | src/plugins/updateinfo/updateinfoplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp index 1ca096b07f8..814e0559f6e 100644 --- a/src/plugins/updateinfo/updateinfoplugin.cpp +++ b/src/plugins/updateinfo/updateinfoplugin.cpp @@ -130,7 +130,7 @@ void UpdateInfoPlugin::startCheckForUpdates() d->m_checkUpdatesCommand->setDisplayName(tr("Checking for Updates")); connect(d->m_checkUpdatesCommand, &ShellCommand::stdOutText, this, &UpdateInfoPlugin::collectCheckForUpdatesOutput); connect(d->m_checkUpdatesCommand, &ShellCommand::finished, this, &UpdateInfoPlugin::checkForUpdatesFinished); - d->m_checkUpdatesCommand->addJob({Utils::FilePath::fromFileInfo(d->m_maintenanceTool), {"--checkupdates"}}, + d->m_checkUpdatesCommand->addJob({Utils::FilePath::fromString(d->m_maintenanceTool), {"--checkupdates"}}, 60 * 3, // 3 minutes timeout /*workingDirectory=*/QString(), [](int /*exitCode*/) { return Utils::SynchronousProcessResponse::Finished; }); |