Merge remote-tracking branch 'origin/2.0'

Conflicts:
	Changelog

Change-Id: Idd7d569f97fba75b05bfc006c7a5b0b9cf8ccf73

1 files changed, 7 insertions, 2 deletions

diff --git a/src/libs/installer/componentchecker.cpp b/src/libs/installer/componentchecker.cpp
index 5ce8641b3..c3bf79cb5 100644
--- a/src/libs/installer/componentchecker.cpp
+++ b/src/libs/installer/componentchecker.cpp
@@ -42,8 +42,13 @@ namespace QInstaller {
 
 QStringList ComponentChecker::checkComponent(Component *component)
 {
-    PackageManagerCore *core = component->packageManagerCore();
     QStringList checkResult;
+    if (!component)
+        return checkResult;
+
+    PackageManagerCore *core = component->packageManagerCore();
+    if (!core)
+        return checkResult;
 
     if (component->childCount() && !component->archives().isEmpty()) {
         checkResult << QString::fromLatin1("Component %1 contains data to be installed "
@@ -80,7 +85,7 @@ QStringList ComponentChecker::checkComponent(Component *component)
         foreach (const QString &dependency, dependencies) {
             Component *dependencyComponent = PackageManagerCore::componentByName(
                         dependency, allComponents);
-            if (autoDependencies.contains(dependencyComponent->name())) {
+            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());