more qt4/qt5 fixes for other platforms