Liang Qi 318b58562a Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: .qmake.conf mkspecs/common/msvc-desktop.conf mkspecs/common/msvc-version.conf mkspecs/common/winrt_winphone/qmake.conf mkspecs/features/mac/default_post.prf mkspecs/features/mac/sdk.prf mkspecs/features/qt.prf mkspecs/features/uikit/default_post.prf mkspecs/features/winrt/default_pre.prf mkspecs/winphone-arm-msvc2013/qmake.conf mkspecs/winphone-x86-msvc2013/qmake.conf mkspecs/winrt-arm-msvc2013/qmake.conf mkspecs/winrt-x64-msvc2013/qmake.conf mkspecs/winrt-x86-msvc2013/qmake.conf qmake/generators/win32/msvc_vcproj.cpp src/gui/kernel/qwindowsysteminterface.cpp src/network/kernel/qhostaddress.cpp src/plugins/platforms/mirclient/qmirclientplugin.cpp src/plugins/platforms/mirclient/qmirclientplugin.h src/widgets/util/qsystemtrayicon.cpp tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp tools/configure/Makefile.mingw tools/configure/Makefile.win32 Done-with: Jake Petroules <jake.petroules@qt.io> Done-with: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Change-Id: I4be3262d3994e11929d3b1ded2c3379783797dbe		2017-01-25 20:06:06 +01:00
..
animation	tst_QPauseAnimation: Use QTRY_COMPARE for checking the stopped state	2017-01-20 18:03:34 +00:00
codecs	tst_utf8: remove duplicate nonCharacters() data	2017-01-10 18:39:31 +00:00
global	Remove qtypetraits.h's contents altogether	2017-01-12 22:16:06 +00:00
io	Make variant selection possible if base is missing	2017-01-20 05:25:19 +00:00
itemmodels	QIPM: Persist model indexes after emitting layoutChange, not before	2016-12-21 01:37:50 +00:00
json	Merge remote-tracking branch 'origin/5.8' into dev	2016-11-17 14:43:26 +01:00
kernel	Merge remote-tracking branch 'origin/5.8' into dev	2017-01-25 20:06:06 +01:00
mimetypes	tests/auto/corelib/mimetypes: use local QThreadPool	2016-09-17 06:47:05 +00:00
plugin	macOS: Don't build auto-tests as application bundles unless explicitly requested	2016-10-23 10:39:56 +00: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	Merge remote-tracking branch 'origin/5.8' into dev	2017-01-25 20:06:06 +01:00
tools	Merge remote-tracking branch 'origin/5.8' into dev	2017-01-25 20:06:06 +01:00
xml	tests/auto/corelib/xml: cleanup	2016-08-27 05:09:16 +00:00
corelib.pro	Add support for Apple tvOS	2016-05-17 16:11:23 +00:00