Update qtdeclarative to pick up merge