qt5base-lts/tests/auto/network/access/qnetworkreply
Simon Hausmann e2f66f9215 Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
	src/corelib/global/qnamespace.qdoc
	src/corelib/io/qwindowspipereader.cpp
	src/corelib/io/qwindowspipereader_p.h
	src/corelib/statemachine/qstatemachine.cpp
	src/corelib/statemachine/qstatemachine_p.h
	src/plugins/platforms/xcb/qxcbconnection.h
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/tools/qmake/tst_qmake.cpp
	tests/manual/touch/main.cpp

Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62
2015-06-03 10:23:56 +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
bigfile 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
element.xml qnetworkreplyfileimpl: set attributes if file was sent 2015-05-04 11:20:40 +00: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.5' into dev 2015-06-03 10:23:56 +02:00