Merge "make perf-measuring code safe across SDK levels" into qt-dev