summaryrefslogtreecommitdiffstats
path: root/src/libs/installer
diff options
context:
space:
mode:
authorjkobus <jaroslaw.kobus@theqtcompany.com>2014-12-01 12:15:57 +0100
committerJarek Kobus <jaroslaw.kobus@theqtcompany.com>2014-12-03 16:04:23 +0100
commit79964b1ee5217f49654498c5e6445dd0477d5589 (patch)
tree0fc212993c2a0538789632898d7636bb28e524b7 /src/libs/installer
parentb8ac163c422b3d8f12d91b92f126a631449a2232 (diff)
Remove unused code.
Dead since commit 5359d0a3e8d84699701e73d3d15163fb20200bb0 Change-Id: I40af485876d70a6a68406eafe14258b185e16323 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Diffstat (limited to 'src/libs/installer')
-rw-r--r--src/libs/installer/component.cpp29
1 files changed, 6 insertions, 23 deletions
diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index 5016b5020..633f7a744 100644
--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
@@ -1171,10 +1171,13 @@ QStringList Component::dependencies() const
QStringList Component::autoDependencies() const
{
- QStringList autoDependencyStringList =
+ const QStringList autoDependencyStringList =
d->m_vars.value(scAutoDependOn).split(QInstaller::commaRegExp(), QString::SkipEmptyParts);
- autoDependencyStringList.removeAll(scScript);
- return autoDependencyStringList;
+ QStringList withoutScriptValuesList;
+ foreach (const QString &string, autoDependencyStringList)
+ if (string.compare(scScript, Qt::CaseInsensitive))
+ withoutScriptValuesList.append(string);
+ return withoutScriptValuesList;
}
/*!
@@ -1201,26 +1204,6 @@ bool Component::isAutoDependOn(const QSet<QString> &componentsToInstall) const
if (autoDependOnList.isEmpty())
return false;
- // The script can override this method and determines if the component needs to be installed.
- if (autoDependOnList.first().compare(scScript, Qt::CaseInsensitive) == 0) {
- QJSValue valueFromScript;
- try {
- valueFromScript = d->scriptEngine()->callScriptMethod(d->m_scriptContext,
- QLatin1String("isAutoDependOn"));
- } catch (const Error &error) {
- MessageBoxHandler::critical(MessageBoxHandler::currentBestSuitParent(),
- QLatin1String("isAutoDependOnError"), tr("Cannot resolve isAutoDependOn in %1"
- ).arg(name()), error.message());
- return false;
- }
-
- if (!valueFromScript.isError())
- return valueFromScript.toBool();
- qDebug() << "Value from script is not valid." << (valueFromScript.toString().isEmpty()
- ? QString::fromLatin1("Unknown error.") : valueFromScript.toString());
- return false;
- }
-
QSet<QString> components = componentsToInstall;
const QStringList installedPackages = d->m_core->localInstalledPackages().keys();
foreach (const QString &name, installedPackages)