Merge pull request #8944 from JosJuice/qtbug-10561-workaround DolphinQt: Replace QTBUG-10561 workaround with better workaround
