qt5base-lts/tests/auto/corelib
Liang Qi 17198e03ab Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
	qmake/doc/src/qmake-manual.qdoc
	src/corelib/global/qglobal.cpp
	src/corelib/tools/qstring.cpp
	src/network/socket/qabstractsocket.cpp
	src/network/socket/qnativesocketengine_unix.cpp
	src/plugins/platforms/eglfs/api/qeglfsglobal.h

Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288
2016-08-16 07:58:32 +02:00
..
animation QtCore: Remove Windows CE. 2016-03-30 11:22:47 +00:00
codecs tests/auto/corelib/codecs: clean up 2016-08-06 14:49:21 +00:00
global tests/auto/corelib/global: clean up 2016-08-06 14:49:09 +00:00
io Merge remote-tracking branch 'origin/5.7' into dev 2016-08-16 07:58:32 +02:00
itemmodels Merge remote-tracking branch 'origin/5.7' into dev 2016-08-16 07:58:32 +02:00
json QJsonValue::toVariant(): Differentiate between null and invalid 2016-08-05 14:53:33 +00:00
kernel Long live QDeadlineTimer 2016-08-15 03:07:16 +00:00
mimetypes Fix/adapt the uses of {to,set,from}Time_t in the qtbase source code 2016-07-06 06:28:13 +00:00
plugin Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
statemachine Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev 2016-01-26 11:27:37 +00:00
thread winrt: Make test functional 2016-08-09 12:13:23 +00:00
tools Merge remote-tracking branch 'origin/5.7' into dev 2016-08-16 07:58:32 +02:00
xml Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-26 10:43:29 +02:00
corelib.pro Add support for Apple tvOS 2016-05-17 16:11:23 +00:00