Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qglobal.h src/corelib/global/qsysinfo.h src/corelib/global/qsystemdetection.h src/corelib/kernel/qobjectdefs.h src/plugins/plugins.pro tests/auto/widgets/itemviews/qlistview/qlistview.pro Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c		2015-07-01 11:05:26 +02:00
..
certs	…
echo	Update copyright headers	2015-02-11 06:49:51 +00:00
test	…
.gitattributes	…
.gitignore	…
BLACKLIST	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
bigfile	…
element.xml	qnetworkreplyfileimpl: set attributes if file was sent	2015-05-04 11:20:40 +00:00
empty	…
image1.jpg	…
image2.jpg	…
image3.jpg	…
index.html	…
qnetworkreply.pro	fix usage of wince scope	2015-06-05 10:29:10 +00:00
qnetworkreply.qrc	…
resource	…
rfc3252.txt	…
smb-file.txt	…
tst_qnetworkreply.cpp	Merge remote-tracking branch 'origin/5.5' into dev	2015-06-03 10:23:56 +02:00