Qt

Cherry pick final change for task QTBUG-6556 to 4.6.2