[dev-qt/qtdemo] Fix bugs #477652 and #477862.

Package-Manager: portage-2.2.0_alpha188