issue #19550: Add more handling per Qt code review