merge from qt4