merging qt dev branches