Merge "Change how PagedTileLayout is measured" into qt-dev