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	…
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	…
.gitignore	…
BLACKLIST	Blacklist ioGetFromHttpBrokenServer:no-newline	2014-12-16 14:36:16 +01:00
bigfile	…
empty	…
image1.jpg	…
image2.jpg	…
image3.jpg	…
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	…
resource	…
rfc3252.txt	…
smb-file.txt	…
tst_qnetworkreply.cpp	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-18 12:12:58 +01:00