feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

UpdateInfoPlugin: Use FilePath for maintenance tool

Browse Source 
Change-Id: I49d2ff74e59faf289cd89d3473ef577e40e2d724
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2022-10-11 14:03:53 +02:00
parent 92d84738cf
commit 80938eae9a
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/updateinfo/updateinfoplugin.cpp
View File

@@ -59,7 +59,7 @@ namespace Internal {
class UpdateInfoPluginPrivate class UpdateInfoPluginPrivate
{ {
public: public:
QString m_maintenanceTool; FilePath m_maintenanceTool;
std::unique_ptr<QtcProcess> m_maintenanceToolProcess; std::unique_ptr<QtcProcess> m_maintenanceToolProcess;
QPointer<FutureProgress> m_progress; QPointer<FutureProgress> m_progress;
QString m_updateOutput; QString m_updateOutput;
@@ -138,7 +138,7 @@ void UpdateInfoPlugin::startCheckForUpdates()
}); });
d->m_maintenanceToolProcess.reset(new QtcProcess); d->m_maintenanceToolProcess.reset(new QtcProcess);
d->m_maintenanceToolProcess->setCommand({Utils::FilePath::fromString(d->m_maintenanceTool), d->m_maintenanceToolProcess->setCommand({d->m_maintenanceTool,
{"ch", "-g", "*=false,ifw.package.*=true"}}); {"ch", "-g", "*=false,ifw.package.*=true"}});
d->m_maintenanceToolProcess->setTimeoutS(3 * 60); // 3 minutes d->m_maintenanceToolProcess->setTimeoutS(3 * 60); // 3 minutes
// TODO handle error // TODO handle error
@@ -151,8 +151,7 @@ void UpdateInfoPlugin::startCheckForUpdates()
d->m_updateOutput = d->m_maintenanceToolProcess->cleanedStdOut(); d->m_updateOutput = d->m_maintenanceToolProcess->cleanedStdOut();
if (d->m_settings.checkForQtVersions) { if (d->m_settings.checkForQtVersions) {
d->m_maintenanceToolProcess.reset(new QtcProcess); d->m_maintenanceToolProcess.reset(new QtcProcess);
d->m_maintenanceToolProcess->setCommand( d->m_maintenanceToolProcess->setCommand({d->m_maintenanceTool,
{Utils::FilePath::fromString(d->m_maintenanceTool),
{"se", "qt[.]qt[0-9][.][0-9]+$", "-g", "*=false,ifw.package.*=true"}}); {"se", "qt[.]qt[0-9][.][0-9]+$", "-g", "*=false,ifw.package.*=true"}});
d->m_maintenanceToolProcess->setTimeoutS(3 * 60); // 3 minutes d->m_maintenanceToolProcess->setTimeoutS(3 * 60); // 3 minutes
connect( connect(
@@ -315,9 +314,9 @@ bool UpdateInfoPlugin::initialize(const QStringList & /* arguments */, QString *
return false; return false;
} }
if (!QFileInfo(d->m_maintenanceTool).isExecutable()) { if (!d->m_maintenanceTool.isExecutableFile()) {
*errorMessage = tr("The maintenance tool at \"%1\" is not an executable. Check your installation.") *errorMessage = tr("The maintenance tool at \"%1\" is not an executable. Check your installation.")
.arg(d->m_maintenanceTool); .arg(d->m_maintenanceTool.toUserOutput());
d->m_maintenanceTool.clear(); d->m_maintenanceTool.clear();
return false; return false;
} }
@@ -358,7 +357,7 @@ void UpdateInfoPlugin::loadSettings() const
UpdateInfoPluginPrivate::Settings def; UpdateInfoPluginPrivate::Settings def;
QSettings *settings = ICore::settings(); QSettings *settings = ICore::settings();
const QString updaterKey = QLatin1String(UpdaterGroup) + '/'; const QString updaterKey = QLatin1String(UpdaterGroup) + '/';
d->m_maintenanceTool = settings->value(updaterKey + MaintenanceToolKey).toString(); d->m_maintenanceTool = FilePath::fromVariant(settings->value(updaterKey + MaintenanceToolKey));
d->m_lastCheckDate = settings->value(updaterKey + LastCheckDateKey, QDate()).toDate(); d->m_lastCheckDate = settings->value(updaterKey + LastCheckDateKey, QDate()).toDate();
d->m_settings.automaticCheck d->m_settings.automaticCheck
= settings->value(updaterKey + AutomaticCheckKey, def.automaticCheck).toBool(); = settings->value(updaterKey + AutomaticCheckKey, def.automaticCheck).toBool();
@@ -479,7 +478,7 @@ QDate UpdateInfoPlugin::nextCheckDate(CheckUpdateInterval interval) const
void UpdateInfoPlugin::startMaintenanceTool(const QStringList &args) const void UpdateInfoPlugin::startMaintenanceTool(const QStringList &args) const
{ {
QtcProcess::startDetached(CommandLine{FilePath::fromString(d->m_maintenanceTool), args}); QtcProcess::startDetached(CommandLine{d->m_maintenanceTool, args});
} }
void UpdateInfoPlugin::startUpdater() const void UpdateInfoPlugin::startUpdater() const