Merge "Make sure GL version string is correct" into qt-dev