Merge "Revert "Use mContext directly"" into qt-qpr1-dev