Merge "Calculate pattern bounds correctly" into qt-dev