merged qt_dev