Merging trondeau/qt branch r11231:11360. This merge improves the usability and exampl...