Liang Qi afab1546a7 Merge remote-tracking branch 'origin/5.5' into 5.6 ... Conflicts: qmake/doc/snippets/code/doc_src_qmake-manual.pro qmake/doc/src/qmake-manual.qdoc src/corelib/io/qstorageinfo_unix.cpp src/corelib/tools/qbytearray.cpp src/widgets/kernel/qwidgetwindow.cpp tests/auto/corelib/io/qprocess/tst_qprocess.cpp tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp tests/auto/network/access/qnetworkreply/BLACKLIST Change-Id: I9efcd7e1cce1c394eed425c43aa6fce7d2edf31c		2015-08-26 20:06:57 +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	…
BLACKLIST	Extend QNetworkReply test exclusion on OS X	2015-08-10 06:54:11 +00:00
bigfile	…
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 5.6	2015-08-26 20:06:57 +02:00