Frederik Gladhorn 77da617dc8 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: doc/global/qt-cpp-defines.qdocconf src/3rdparty/forkfd/forkfd.c src/corelib/codecs/qtextcodec.cpp src/corelib/kernel/qmetatype.cpp src/corelib/tools/qset.qdoc src/gui/accessible/qaccessible.cpp src/gui/image/qpixmapcache.cpp src/opengl/qgl.cpp src/tools/qdoc/generator.cpp src/widgets/kernel/qwidget.cpp tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085		2015-08-06 10:54:01 +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	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
element.xml	qnetworkreplyfileimpl: set attributes if file was sent	2015-05-04 11:20:40 +00:00
empty
image1.jpg
image2.jpg
image3.jpg
index.html
qnetworkreply.pro	fix usage of wince scope	2015-06-05 10:29:10 +00:00
qnetworkreply.qrc
resource
rfc3252.txt
smb-file.txt
tst_qnetworkreply.cpp	Merge remote-tracking branch 'origin/5.5' into dev	2015-08-06 10:54:01 +02:00