Merge "Change the scope to system" into qt-dev