QT->TQT changes in main trunk