Merge "Process insets correctly" into qt-dev