qtgui: fixing file mixup when merging maint->master.