Add a warning if component with data contains children.

Change-Id: Idec0530aac7db2c4773831bdabe904d44ad71822
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>

1 files changed, 9 insertions, 3 deletions

diff --git a/src/libs/installer/componentchecker.cpp b/src/libs/installer/componentchecker.cpp
index 949ae00cf..5ce8641b3 100644
--- a/src/libs/installer/componentchecker.cpp
+++ b/src/libs/installer/componentchecker.cpp
@@ -45,6 +45,12 @@ QStringList ComponentChecker::checkComponent(Component *component)
     PackageManagerCore *core = component->packageManagerCore();
     QStringList checkResult;
 
+    if (component->childCount() && !component->archives().isEmpty()) {
+        checkResult << QString::fromLatin1("Component %1 contains data to be installed "
+            "while having child components. This may not work properly.")
+            .arg(component->name());
+    }
+
     const bool defaultPropertyScriptValue = component->variables().value(scDefault).compare(scScript, Qt::CaseInsensitive) == 0;
     const bool defaultPropertyValue = component->variables().value(scDefault).compare(scTrue, Qt::CaseInsensitive) == 0;
     const QStringList autoDependencies = component->autoDependencies();
@@ -110,7 +116,7 @@ QStringList ComponentChecker::checkComponent(Component *component)
             const QStringList autoDependencies = component->autoDependencies();
             if (!autoDependencies.isEmpty()) {
                 checkResult << QString::fromLatin1("Component %1 auto depends on other components "
-                    "while having children components. This will not work properly.")
+                    "while having child components. This will not work properly.")
                     .arg(component->name());
             }
 
@@ -119,13 +125,13 @@ QStringList ComponentChecker::checkComponent(Component *component)
 
             if (!component->dependencies().isEmpty()) {
                 checkResult << QString::fromLatin1("Component %1 depends on other components "
-                    "while having children components. This will not work properly.")
+                    "while having child components. This will not work properly.")
                     .arg(component->name());
             }
 
             if (!core->dependees(component).isEmpty()) {
                 checkResult << QString::fromLatin1("Other components depend on component %1 "
-                    "which has children components. This will not work properly.")
+                    "which has child components. This will not work properly.")
                     .arg(component->name());
             }
         }