Merge "fix nullability" into qt-dev