qtgui: fixing file mixup when merging maint->master.
Merge branch 'master' into next