Liang Qi 7950b6b283 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/corelib/tools/qbytearray.h src/corelib/tools/qdatetime.h src/corelib/tools/qstring.h src/corelib/tools/qversionnumber.h src/plugins/platforms/android/qandroidplatformintegration.cpp tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp Change-Id: Iefd92a435e687a76cd593099e40d9a9620a1454d		2017-04-20 12:31:27 +02:00
..
.gitignore	tst_QHash: Factor qHash()-related test cases into a separate test	2015-01-05 20:18:51 +01:00
qhashfunctions.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
tst_qhashfunctions.cpp	Merge remote-tracking branch 'origin/5.9' into dev	2017-04-20 12:31:27 +02:00