Liang Qi 511790fd1a Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: config_help.txt configure mkspecs/features/uikit/sdk.prf src/corelib/global/qhooks.cpp src/corelib/io/qfilesystemwatcher.cpp src/corelib/io/qlockfile_unix.cpp src/corelib/tools/qalgorithms.h src/gui/kernel/qwindowsysteminterface.h src/gui/text/qtextdocument_p.cpp src/network/access/access.pri src/network/access/qnetworkaccessmanager.cpp src/network/access/qnetworkreplynsurlconnectionimpl.mm src/src.pro src/testlib/qtestcase.cpp src/widgets/kernel/qwidgetbackingstore_p.h src/widgets/styles/qwindowscestyle.cpp src/widgets/styles/qwindowsmobilestyle.cpp tests/auto/corelib/io/qdiriterator/qdiriterator.pro tests/auto/corelib/io/qfileinfo/qfileinfo.pro tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp tools/configure/configureapp.cpp Change-Id: Ibf7fb9c8cf263a810ade82f821345d0725c57c67		2016-06-13 12:46:46 +02:00
..
certs	…
echo	Updated license headers	2016-01-21 18:55:18 +00:00
test	Fix compilation for WinRT	2015-12-14 08:43:15 +00:00
.gitattributes	…
.gitignore	…
BLACKLIST	tst_QNetworkReply: Un-blacklist recently fixed test.	2016-05-25 11:12:00 +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	QtNetwork: Remove Windows CE.	2016-03-29 20:28:18 +00:00
qnetworkreply.qrc	…
resource	…
rfc3252.txt	…
smb-file.txt	…
tst_qnetworkreply.cpp	Remove all code paths related to unsupported Apple platforms.	2016-06-04 09:24:33 +00:00