Commit 32813776 authored by Christian Kandeler's avatar Christian Kandeler

RemoteLinux: Fix crash introduced by merge.

Change-Id: Iea18410bc812fb5c27442ae01c408113e6bceece
Reviewed-on: http://codereview.qt.nokia.com/2789Reviewed-by: default avatarChristian Kandeler <christian.kandeler@nokia.com>
parent b1c881ce
......@@ -103,6 +103,8 @@ QString MaemoDeployStepFactory::displayNameForId(const QString &id) const
return MaemoCopyToSysrootStep::displayName();
else if (id == MaemoMakeInstallToSysrootStep::Id)
return MaemoMakeInstallToSysrootStep::displayName();
else if (id == GenericDirectUploadStep::stepId())
return GenericDirectUploadStep::displayName();
return QString();
}
......@@ -134,6 +136,8 @@ BuildStep *MaemoDeployStepFactory::create(BuildStepList *parent, const QString &
} else if (id == MeegoUploadAndInstallPackageStep::stepId()
|| (id == OldMaemoDeployStepId && (qobject_cast<const Qt4MeegoTarget *>(t)))) {
return new MeegoUploadAndInstallPackageStep(parent);
} else if (id == GenericDirectUploadStep::stepId()) {
return new GenericDirectUploadStep(parent, id);
}
return 0;
......@@ -188,6 +192,9 @@ BuildStep *MaemoDeployStepFactory::clone(BuildStepList *parent, BuildStep *produ
} else if (product->id() == MaemoMakeInstallToSysrootStep::Id) {
return new MaemoMakeInstallToSysrootStep(parent,
qobject_cast<MaemoMakeInstallToSysrootStep *>(product));
} else if (product->id() == GenericDirectUploadStep::stepId()) {
return new GenericDirectUploadStep(parent,
qobject_cast<GenericDirectUploadStep *>(product));
}
return 0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment