Update to qml.v1 and minor additions