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
..
clipboard.pro	Merge remote-tracking branch 'origin/5.9' into dev	2017-04-20 12:31:27 +02:00
qmacmime_p.h	Updated license headers	2016-01-15 12:25:24 +00:00
qmacmime.mm	qmacmime: modernize QMacPasteboardMimeTiff	2017-04-18 10:19:04 +00:00