Allan Sandfeld Jensen 1fce111809 Merge remote-tracking branch 'origin/5.4' into merge5.5 ... Conflicts: src/corelib/global/qglobal.h src/corelib/io/qnoncontiguousbytedevice_p.h src/gui/image/qjpeghandler.cpp src/network/access/qhttpthreaddelegate_p.h tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp tests/auto/widgets/widgets/qmenubar/BLACKLIST Change-Id: I01de8c1c28efcedfd7953d05025f54802dc08ab3		2015-05-08 13:26:44 +02:00
..
certs
echo	Update copyright headers	2015-02-11 06:49:51 +00:00
test	QtNetwork tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2014-02-25 16:47:13 +01:00
.gitattributes
.gitignore
bigfile
BLACKLIST	Tests: Blacklist tests for ubuntu 14.04	2015-04-01 13:59:04 +00:00
empty
image1.jpg
image2.jpg
image3.jpg
index.html
qnetworkreply.pro
qnetworkreply.qrc
resource
rfc3252.txt
smb-file.txt
tst_qnetworkreply.cpp	Merge remote-tracking branch 'origin/5.4' into merge5.5	2015-05-08 13:26:44 +02:00