diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2019-11-27 14:01:43 +0000 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2019-11-28 08:43:49 +0000 |
| commit | cb7667dd05766605a2bc63b4b2219799ca0ffa81 (patch) | |
| tree | a21a702e19d34e9c847317b5d4c0dcff86f60818 /src | |
| parent | ecd7fdf878f61485e3a8d159dee9cf8c6ba48869 (diff) | |
Revert "Fix addDependency functionality"
This reverts commit 7dd35b336fbaa78e5f3b347c5e1875743d146fb0.
Reason for revert: Change was causing a recursion error.
Change-Id: I273a92fbb3292f33d5e0860085102f6e5cc90e13
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/installer/installercalculator.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/libs/installer/installercalculator.cpp b/src/libs/installer/installercalculator.cpp index a35cb99fb..db1f88563 100644 --- a/src/libs/installer/installercalculator.cpp +++ b/src/libs/installer/installercalculator.cpp @@ -158,14 +158,6 @@ bool InstallerCalculator::appendComponentsToInstall(const QList<Component *> &co bool InstallerCalculator::appendComponentToInstall(Component *component, const QString &version) { QSet<QString> allDependencies = component->dependencies().toSet(); - // All parents are kind of dependencies as well. If we select sub item in treeview, parent gets - // checked or partially checked as well. When adding component as dependency in script or - // config.xml we need to add the parent as dependency so the behavior is the same as in visual UI. - if (component->parentComponent() && - !allDependencies.contains(component->parentComponent()->name()) && - !m_visitedComponents.contains(component->parentComponent())) { - allDependencies.insert(component->parentComponent()->name()); - } QString requiredDependencyVersion = version; foreach (const QString &dependencyComponentName, allDependencies) { // PackageManagerCore::componentByName returns 0 if dependencyComponentName contains a |