Merge "Fast follow-on unit tests for HashedStringCache" into qt-dev