qt6-bb10/tests/auto/network/access/qnetworkreply
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 Moved network autotests into new directory structure 2011-09-09 09:32:17 +02:00
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 Create auto test for http HEAD request 2011-10-06 11:24:20 +02:00
.gitignore Moved network autotests into new directory structure 2011-09-09 09:32:17 +02:00
BLACKLIST Tests: Blacklist tests for ubuntu 14.04 2015-04-01 13:59:04 +00:00
bigfile Moved network autotests into new directory structure 2011-09-09 09:32:17 +02:00
empty Moved network autotests into new directory structure 2011-09-09 09:32:17 +02:00
image1.jpg Moved network autotests into new directory structure 2011-09-09 09:32:17 +02:00
image2.jpg Moved network autotests into new directory structure 2011-09-09 09:32:17 +02:00
image3.jpg Moved network autotests into new directory structure 2011-09-09 09:32:17 +02:00
index.html fix tst_QNetworkReply::headFromHttp failure 2011-10-12 18:01:19 +02:00
qnetworkreply.pro Changed qnetworkreply unittest to work from install directory 2012-02-17 08:25:10 +01:00
qnetworkreply.qrc Moved network autotests into new directory structure 2011-09-09 09:32:17 +02:00
resource Moved network autotests into new directory structure 2011-09-09 09:32:17 +02:00
rfc3252.txt Moved network autotests into new directory structure 2011-09-09 09:32:17 +02:00
smb-file.txt Moved network autotests into new directory structure 2011-09-09 09:32:17 +02:00
tst_qnetworkreply.cpp Merge remote-tracking branch 'origin/5.4' into merge5.5 2015-05-08 13:26:44 +02:00