Simon Hausmann e281537f20 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/global/qglobal.h src/platformsupport/platformcompositor/qopenglcompositor.cpp src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I5422868500be695584a496dbbbc719d146bc572d		2014-12-18 12:12:58 +01:00
..
certs	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
echo	Update license headers and add new license files	2014-09-24 12:26:19 +02: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	Blacklist ioGetFromHttpBrokenServer:no-newline	2014-12-16 14:36:16 +01: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 dev	2014-12-18 12:12:58 +01:00