Merge "Fix TileLayout#onMeasure" into qt-dev