Merge "Minor changes for DnsResolverTest" into qt-dev