QmlDesigner: Fix composite hack in the ObjectNodeInstance

There was no check for the else branch that the type pointer is null.

Change-Id: I0c40eb86f324033dc7878465bd5f603d9b96df06
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
QmlDesigner: Change version number of the puppet to 2

Change-Id: I0aafaf76a6d4d6edfd4c3ccc73b702edbbfaa385
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>