few more modification for qt5/qt4 build