AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
305dd1b61f
qt5base-lts/tests/auto/network/access
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
..
hpack Change almost all other uses of qrand() to QRandomGenerator 2017-11-08 09:14:03 +00:00
hsts Introduce QHstsStore - the permanent store for HSTS policies 2017-08-02 22:01:47 +00:00
http2 Merge remote-tracking branch 'origin/5.10' into dev 2017-11-23 09:36:03 +01:00
qabstractnetworkcache qabstractnetworkcache - enable several tests 2016-01-26 13:12:03 +00:00
qftp Merge remote-tracking branch 'origin/5.9' into 5.11 2018-02-14 12:51:24 +01:00
qhttpnetworkconnection Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00
qhttpnetworkreply Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
qnetworkaccessmanager Updated license headers 2016-01-21 18:55:18 +00:00
qnetworkcachemetadata Updated license headers 2016-01-21 18:55:18 +00:00
qnetworkcookie Add qtest_network.h 2016-09-29 21:46:19 +00:00
qnetworkcookiejar Fix cookie path matching for empty url path 2017-10-19 12:51:38 +00:00
qnetworkdiskcache Change almost all other uses of qrand() to QRandomGenerator 2017-11-08 09:14:03 +00:00
qnetworkreply Merge remote-tracking branch 'origin/5.9' into 5.11 2018-02-14 12:51:24 +01:00
qnetworkrequest Add qtest_network.h 2016-09-29 21:46:19 +00:00
spdy Updated license headers 2016-01-21 18:55:18 +00:00
access.pro Add HTTP strict tranport security support to QNAM 2017-01-20 08:41:50 +00:00