From 27f085218c66c27546544f875a83fcf8da905f11 Mon Sep 17 00:00:00 2001 From: Martin Kampas Date: Tue, 18 Sep 2018 09:56:27 +0200 Subject: Allow to set ForcedInstallation from component script Change-Id: I7bba68f5159737971de9801012daef8aaff09216 Task-number: QTIFW-675 Reviewed-by: Katja Marttila --- src/libs/installer/component.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/libs') diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index 16b417b02..5c64d3cf1 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -284,10 +284,6 @@ void Component::loadDataFromPackage(const KDUpdater::LocalPackage &package) setValue(scAutoDependOn, package.autoDependencies.join(QLatin1String(","))); setValue(scForcedInstallation, package.forcedInstallation ? scTrue : scFalse); - if (package.forcedInstallation & !PackageManagerCore::noForceInstallation()) { - setCheckable(false); - setCheckState(Qt::Checked); - } setValue(scVirtual, package.virtualComp ? scTrue : scFalse); setValue(scCurrentState, scInstalled); setValue(scCheckable, package.checkable ? scTrue : scFalse); @@ -331,10 +327,6 @@ void Component::loadDataFromPackage(const Package &package) if (PackageManagerCore::noForceInstallation()) forced = scFalse; setValue(scForcedInstallation, forced); - if (forced == scTrue) { - setCheckable(false); - setCheckState(Qt::Checked); - } setLocalTempPath(QInstaller::pathFromUrl(package.packageSource().url)); const QStringList uis = package.data(QLatin1String("UserInterfaces")).toString() @@ -423,6 +415,12 @@ void Component::setValue(const QString &key, const QString &value) this->setCheckable(normalizedValue.toLower() == scTrue); if (key == scExpandedByDefault) this->setExpandedByDefault(normalizedValue.toLower() == scTrue); + if (key == scForcedInstallation) { + if (value == scTrue && !PackageManagerCore::noForceInstallation()) { + setCheckable(false); + setCheckState(Qt::Checked); + } + } d->m_vars[key] = normalizedValue; emit valueChanged(key, normalizedValue); -- cgit v1.2.3