Fix phonon compile error.
Merge remote-tracking branch 'upstream/master'
rename gui/share/pixmaps/