main/file: upgrade to 5.21
main/qt5-qtdeclarative: fix file conflicts with qt4