Liang Qi d1ea481345 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/network/access/qnetworkreply.cpp tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp Change-Id: Iadf766269454087e69fb216fc3857d85b0ddfaad		2017-05-07 13:08:18 +02:00
..
qmake.conf	Merge remote-tracking branch 'origin/5.9' into dev	2017-05-07 13:08:18 +02:00
qplatformdefs.h	Updated license headers	2016-01-15 12:25:24 +00:00