Finish the QVariant porting