Merge "Revert "don't compute outside of visible range"" into qt-dev