AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
305dd1b61f
qt5base-lts/tests/auto/network/access/qnetworkreply
History
Liang Qi 305dd1b61f Merge remote-tracking branch 'origin/5.9' into 5.11 
Conflicts:
	.qmake.conf
	src/corelib/animation/qvariantanimation.cpp
	src/corelib/global/qglobal.cpp
	src/corelib/global/qlogging.cpp
	src/corelib/io/qprocess_win.cpp
	src/corelib/json/qjsonarray.cpp
	src/corelib/tools/qsimd_p.h
	src/corelib/tools/qtimezoneprivate_p.h
	src/corelib/xml/qxmlstream_p.h
	src/gui/kernel/qsimpledrag.cpp
	src/gui/kernel/qsimpledrag_p.h
	src/plugins/generic/generic.pro
	src/plugins/platforms/cocoa/qcocoamenu.mm
	src/widgets/styles/qmacstyle_mac.mm
	tests/auto/concurrent/qtconcurrentmap/BLACKLIST
	tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/kernel/qwindow/BLACKLIST
	tests/auto/widgets/dialogs/qmessagebox/BLACKLIST

Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e
2018-02-14 12:51:24 +01:00
..
certs Moved network autotests into new directory structure 2011-09-09 09:32:17 +02:00
echo Updated license headers 2016-01-21 18:55:18 +00:00
test tst_qnetworkreply: Replace insignificant_test with blacklisting 2017-10-29 10:12:17 +00: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 Merge remote-tracking branch 'origin/5.9' into 5.11 2018-02-14 12:51:24 +01:00
element.xml qnetworkreplyfileimpl: set attributes if file was sent 2015-05-04 11:20:40 +00: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 QtNetwork: Remove Windows CE. 2016-03-29 20:28:18 +00: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.10' into dev 2017-11-30 09:16:58 +01:00