summaryrefslogtreecommitdiffstats
path: root/src/libs
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2018-02-23 07:59:31 +0200
committerKatja Marttila <katja.marttila@qt.io>2018-02-26 11:19:16 +0000
commit4f1e3f8e047457d3aa7b730c4afd01dcbac61314 (patch)
treef2db1f9e7b46d56ae7475eb66042d8822a518089 /src/libs
parent0a842140f5d7cc7383c5266acbbc74428dd82014 (diff)
Remove unnecessary warning
Removed unnecessary warning about component specifying both autodependency and dependency to same component. Both of them might be necessary if we need to ensure the install order. Adding the same component as dependency will ensure that the dependency component will be installed first and its scripts run first. Task-number: QTIFW-1022 Change-Id: Id400f1ecf00a4b863ee473218d61a549c6ceb9ca Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'src/libs')
-rw-r--r--src/libs/installer/componentchecker.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/libs/installer/componentchecker.cpp b/src/libs/installer/componentchecker.cpp
index e21bc6696..de8626329 100644
--- a/src/libs/installer/componentchecker.cpp
+++ b/src/libs/installer/componentchecker.cpp
@@ -76,16 +76,6 @@ QStringList ComponentChecker::checkComponent(Component *component)
"component %1. This may not work properly.")
.arg(component->name());
}
- const QStringList dependencies = component->dependencies();
- foreach (const QString &dependency, dependencies) {
- Component *dependencyComponent = PackageManagerCore::componentByName(
- dependency, allComponents);
- if (dependencyComponent && autoDependencies.contains(dependencyComponent->name())) {
- checkResult << QString::fromLatin1("Component %1 specifies both dependency "
- "and auto dependency on component %2. The dependency might be superfluous.")
- .arg(component->name(), dependencyComponent->name());
- }
- }
}
if (component->packageManagerCore()->isInstaller()) {
if (component->isTristate()) {