merging qtdevel branch -r10534:10564 to sync with trunk because my computer got confu...